diff options
| author | Chong Zhang <chz@google.com> | 2016-06-08 01:31:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 01:31:01 +0000 |
| commit | 2ae1144d7e7483cd51f4c4090e5cb21f4eabdd19 (patch) | |
| tree | 05752470630b8247a25e6a669da16b1ef700401d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c6a520e0907447e4bb88c608236804fd36ec00f2 (diff) | |
| parent | 22eaf715a1de99889988ff94930b7148e11d819c (diff) | |
Merge \"Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am: 723e5afa9e\" into nyc-mr1-dev
am: 22eaf715a1
Change-Id: I657487ecab8b23a002e32072bca17d21e627a804
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions