commit | 70d7b0aa84c038832f544fc1790982021901c1ed | [log] [tgz] |
---|---|---|
author | Jorim Jaggi <jjaggi@google.com> | Fri May 27 22:02:42 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 27 22:02:42 2016 +0000 |
tree | d8e66d9624f63fb09239211d3d39f6e5a6b16101 | |
parent | bae9b4901a26682761973a4cfc5fead3c879987a [diff] | |
parent | 3b5aac257bd9092de4c552ac095d5cbf7109a9b7 [diff] |
Merge "Merge "Handle trampoline activites in different tasks" into nyc-dev am: 0d35765ca3 am: 03d0a3aeff" into nyc-mr1-dev-plus-aosp am: 3b5aac257b * commit '3b5aac257bd9092de4c552ac095d5cbf7109a9b7': Handle trampoline activites in different tasks Change-Id: I369dc499ac8edadf3a3ec0fe3bfce23753331268