tree 9ef75b94274cea726cdd5474a90d8e81e3d54901
parent 43ce00e7375fae5db66177552f973e317e6b7318
parent cf05e364e70475c8f1eabfb93bdcacbaf723a903
author Android Build Merger (Role) <android-build-merger@google.com> 1461280720 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461280720 +0000

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