summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorChen Xu <fionaxu@google.com>2018-10-22 10:50:34 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-10-22 10:50:34 -0700
commit8463ad7760afe9fc0c3d234519c7f300021e2242 (patch)
tree301300ac353a884471f65fed086c06fac7cc5fd7 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent00b65127e25daa37e4b05b8a6858a75b7f55f40c (diff)
parentfccdf46adf096e9ba200ce79e00f6df379b5c649 (diff)
Merge changes from topic "carrier_id_aosp_cp"
am: fccdf46adf Change-Id: I7a332c2ec55081ba7e64cd776203f86f4916a22f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions