| commit | 1a99e8e2814d0e93847897c8f709a963cd58d6d7 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Sat Mar 15 00:31:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 15 00:31:19 2014 +0000 |
| tree | edc0b82c0a060f611780a7c1fc8c59161b32bacd | |
| parent | efda256d15a008457ee03e0671f89afa34bfaf97 [diff] | |
| parent | 902e4b10d46c5ad226780ad96dc2152daa767245 [diff] |
am 902e4b10: (-s ours) am 8197904a: am 7d64b7ed: am 36eefaf3: am ef4e5484: Merge "Disable animations if manually overriding. DO NOT MERGE." into klp-dev * commit '902e4b10d46c5ad226780ad96dc2152daa767245': Disable animations if manually overriding. DO NOT MERGE.