summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2016-06-08 01:19:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-08 01:19:03 +0000
commit1895addcef770bfa213344eb54eba1f5c2991a5a (patch)
tree3fda44bfe420f755d9933db6ff718729a705e2e6 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent9d178342d83ec98a5a00b370320f18eec2999324 (diff)
parent723e5afa9e3a6e14271d170230da58d2649c88b6 (diff)
Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
am: 723e5afa9e Change-Id: I12f294f42e135fc181f585c515cd9ad4589ac1f2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions