OSDN Git Service

Merge "Allow performShowLocked when transition animation started" into nyc-mr1-dev...
authorChong Zhang <chz@google.com>
Mon, 15 Aug 2016 19:25:36 +0000 (19:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 15 Aug 2016 19:25:36 +0000 (19:25 +0000)
am: 2261bb362b

Change-Id: I92ea546d7f197c2f5c8dc6e0b00f88f48274fdaa


Trivial merge