Skip to content
Commit 70d7b0aa authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Merge "Handle trampoline activites in different tasks" into nyc-dev am:... 

Merge "Merge "Handle trampoline activites in different tasks" into nyc-dev am: 0d35765c am: 03d0a3ae" into nyc-mr1-dev-plus-aosp
am: 3b5aac25

* commit '3b5aac25':
  Handle trampoline activites in different tasks

Change-Id: I369dc499ac8edadf3a3ec0fe3bfce23753331268
parents bae9b490 3b5aac25
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment