summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMichael Kwan <mkwan@google.com>2017-01-10 01:53:19 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-10 01:53:19 +0000
commit30ecdc2a3f4323e836679cff2c4a3ce3899f9d1c (patch)
tree97e3fbbd16cb021844fa4f6c809216edb0f1599d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent47d0126018d23311e51abb7324a46858b77ba3f1 (diff)
parent97efbc128fa1e3c09197b3cf9bd91d4bd432b9d0 (diff)
Merge "Check if the activity translucency was converted before converted back. am: 39dd370d8e am: fe9e68a63c" into nyc-mr2-dev-plus-aosp
am: 97efbc128f Change-Id: Ib974a49f3b8a829153322fb1e04d185c0180da8e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions