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:28:28 +0000 (18:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 May 2017 18:28:28 +0000 (18:28 +0000)
commit495661aa1ab261a55213f22f0fc1684cf3599f2d
tree65fc6517d969264f9ba82d49974406c8e2ad184d
parent7036a5829b9fcfc139c03d52656f46dda7a7ab21
parent5ff4d4516310eacca3a889b7c642bf71ef73b55d
Merge "Wait on activity brought to front for trampoline activities." into oc-dev am: 1ba237d237
am: 5ff4d45163

Change-Id: I4de41303b1c2a59c9d7470ceab1b8902d2be5596