summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMichael Kwan <mkwan@google.com>2017-01-10 01:57:33 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-10 01:57:33 +0000
commitc026326cb2b24d36b2a6bb85a4f07b18c5637326 (patch)
tree97e3fbbd16cb021844fa4f6c809216edb0f1599d /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc2cfc69960aca002c9df40bf902936b1adae012e (diff)
parent636fc0d54c1d83b1f889d69ea6dd11aa96033c38 (diff)
Merge "Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am: 6d7dc11e01 am: 4ebbea26cc" into nyc-mr2-dev-plus-aosp
am: 636fc0d54c Change-Id: Ia126f71f274f31b0d43086277199d7fcf55aa6f8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions