diff options
author | Chong Zhang <chz@google.com> | 2016-06-08 01:27:16 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 01:27:16 +0000 |
commit | 456fc8cd3c433c4c6a209b6e9f50131ed868a69a (patch) | |
tree | cba9444341e3e8d7b538696a240e1f2827a37d1e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 3b37c224b56027f19a3170969fbe89c639db0bfd (diff) | |
parent | 1895addcef770bfa213344eb54eba1f5c2991a5a (diff) |
Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am: 723e5afa9e
am: 1895addcef
Change-Id: Ifb8ca430fbb754a73e6b891c5a97e0cf201cf7f4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions