OSDN Git Service

Merge "Wait on activity brought to front for trampoline activities." into oc-dev
authorBryce Lee <brycelee@google.com>
Mon, 22 May 2017 18:12:49 +0000 (18:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 May 2017 18:12:49 +0000 (18:12 +0000)
commit5ff4d4516310eacca3a889b7c642bf71ef73b55d
treee4f4be63cb7438df3aef838b42869651281520c0
parent5dceb97fd3bd353f674cf34054d860802fd792c0
parent1ba237d237830bf97b97b1cf1d7bd205b2c4fc90
Merge "Wait on activity brought to front for trampoline activities." into oc-dev
am: 1ba237d237

Change-Id: I61a006f5e8e2b29964f063ce1eb55154ce29a3b8