summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-01-09 23:16:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-01-09 23:16:15 +0000
commit97efbc128fa1e3c09197b3cf9bd91d4bd432b9d0 (patch)
tree189d049ad858ac8f3744475ccc214a23c9e244b4 /tools/aapt2/java/JavaClassGenerator.cpp
parentc252b661e6074611019e226da669613595057540 (diff)
parent69f30b2d5e4f8bd3a5d04a5dcd85c81e4d3762fe (diff)
Merge "Check if the activity translucency was converted before converted back. am: 39dd370d8e am: fe9e68a63c" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions