OSDN Git Service

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

Change-Id: I47692dcaef58641e1fbf6632cfb59d843c43d667


Trivial merge