summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-07-12 00:01:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-12 00:01:13 +0000
commit826a6354a147d1a2618d2250ce2b8a01b922ffd9 (patch)
treee44449792f3a31ec33f80ffb92f01dfd8a59228f /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6c66b01b50edab05b4cc6a0e75653bf68ac15837 (diff)
parentda70788a6f3a698798f615f0df93ecaa6d3f7860 (diff)
Merge "Merge \"Don\'t force fstrim on OTA\" into nyc-mr1-dev am: bef41bf538" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions