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)
commit2261bb362beaa95f962126d0cd7436850ed77acf
tree0786ab88f0fbff4e78d4b94eb51123540be28d7a
parent280d7fdcb01247b2305e019f08d7b58aed2f3402
parent1fb9466c1d6ef050b7de09fe26d3e2c6070571ec
Merge "Allow performShowLocked when transition animation started" into nyc-mr1-dev
am: 1fb9466c1d

Change-Id: I47692dcaef58641e1fbf6632cfb59d843c43d667