OSDN Git Service

Merge "Handle trampoline activites in different tasks" into nyc-dev
authorJorim Jaggi <jjaggi@google.com>
Thu, 26 May 2016 23:41:41 +0000 (23:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 May 2016 23:41:41 +0000 (23:41 +0000)
commit1833aafe7f799761f9d6c8e02ed077342e3e1650
treed7251ab5f4dbd2607324c84d08a6681a3eae7a95
parent66eeff63b719a6cb1e0c038df6687dc5555871fd
parent0d35765ca343ae7b04df7a93c233e5b6860eec22
Merge "Handle trampoline activites in different tasks" into nyc-dev
am: 0d35765ca3

* commit '0d35765ca343ae7b04df7a93c233e5b6860eec22':
  Handle trampoline activites in different tasks

Change-Id: I9de9ac5a6e42f75dd8a8c4c9f07c60efb48aa2b7