diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-06-08 01:27:43 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-08 01:27:45 +0000 |
commit | c6a520e0907447e4bb88c608236804fd36ec00f2 (patch) | |
tree | 05752470630b8247a25e6a669da16b1ef700401d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 02e2d72d558af1b896ee1688325340fcd9cca183 (diff) | |
parent | 456fc8cd3c433c4c6a209b6e9f50131ed868a69a (diff) |
Merge "Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am: 723e5afa9e am: 1895addcef" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions