tree 3cc16e6a186545703ab30c491458fc48e7f419b5
parent a19f4b9808607020ce5a980ff4e2418a0d1fd2b3
parent 16541c60ad04c3f87279f8044ee3b0698549413f
author Adrian Roos <roosa@google.com> 1465934345 +0000
committer android-build-merger <android-build-merger@google.com> 1465934345 +0000

Merge \"Update AssistDisclosure animation\" into nyc-mr1-dev
am: 16541c60ad

Change-Id: I7ac13b511d5b32bf6041626035b1bb249a4aa0d0