tree 7fecbfdb09835ed17a794b77885c30f9074b548b
parent d134504db91335ad2120a3c12411940db93490b6
parent 9ac7ff6b3cfcbe981b30ea35c660b82872203039
author Elliott Hughes <enh@google.com> 1461280851 +0000
committer android-build-merger <android-build-merger@google.com> 1461280851 +0000

Merge "Go back to the old ear-wiggling Android animation. am: 692941be79 am: 87b0654f00" into nyc-mr1-dev-plus-aosp
am: 9ac7ff6b3c

* commit '9ac7ff6b3cfcbe981b30ea35c660b82872203039':

Change-Id: I3f03c5e2ff82a5de7dbf0843f014d7dc47b23290