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