diff options
author | Jorim Jaggi <jjaggi@google.com> | 2016-05-27 03:31:26 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-27 03:31:26 +0000 |
commit | 03d0a3aeffe0dddfa1c2cfc26df0a155d7470f4f (patch) | |
tree | 2370649b8dcb6dcef4bbbac220696bcad9a2882a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c37fb8aa6e2094336201840ec0a44aa0a5ad6913 (diff) | |
parent | 0d35765ca343ae7b04df7a93c233e5b6860eec22 (diff) |
Merge "Handle trampoline activites in different tasks" into nyc-dev
am: 0d35765ca3
* commit '0d35765ca343ae7b04df7a93c233e5b6860eec22':
Handle trampoline activites in different tasks
Change-Id: I0f930e67f9cf179d7b819df9969979b12be0b929
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions