summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2015-05-01 22:05:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-01 22:05:57 +0000
commit6e51a707ea986102fb507bfdf00d2a4dddee70f7 (patch)
treee6066f1519f82b9946ecf31089d05a6b59b3f008 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf157249b63ea77d568856cfc4961156ae23f236c (diff)
parent378510c3aecf958871e4d9b35b9bb5e80f5e9ea2 (diff)
am 378510c3: am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev
* commit '378510c3aecf958871e4d9b35b9bb5e80f5e9ea2': Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions