| commit | 8197904a57d494b8eda8ae19718325ed4a3c2c3a | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Sat Mar 15 00:23:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 15 00:23:21 2014 +0000 |
| tree | 83b5588e92928e69cd081cc2d6819435ed9a9ebd | |
| parent | 6973a47973714be9fdf8aad6c2ac1588ac54ec33 [diff] | |
| parent | 7d64b7edb7ddd4c52373cd2c32b213f819e306dd [diff] |
am 7d64b7ed: am 36eefaf3: am ef4e5484: Merge "Disable animations if manually overriding. DO NOT MERGE." into klp-dev * commit '7d64b7edb7ddd4c52373cd2c32b213f819e306dd': Disable animations if manually overriding. DO NOT MERGE.