summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-11-30 03:34:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-11-30 03:34:28 +0000
commit6abec500324ba240eba3d563ca7e348fa2cfffd7 (patch)
treee3ff593567707ada99dffacc241320afbaaba63b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent9d6bb6929a3b894825f38df5e1c992980d7d2d7c (diff)
parent1b9cec4860db513354239fc6cf5187eb4cc36464 (diff)
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback am: f73d085395 am: c2ca17711e" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions