| commit | 495661aa1ab261a55213f22f0fc1684cf3599f2d | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Mon May 22 18:28:28 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 22 18:28:28 2017 +0000 |
| tree | 65fc6517d969264f9ba82d49974406c8e2ad184d | |
| parent | 7036a5829b9fcfc139c03d52656f46dda7a7ab21 [diff] | |
| parent | 5ff4d4516310eacca3a889b7c642bf71ef73b55d [diff] |
Merge "Wait on activity brought to front for trampoline activities." into oc-dev am: 1ba237d237 am: 5ff4d45163 Change-Id: I4de41303b1c2a59c9d7470ceab1b8902d2be5596