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