diff options
author | Jack Yu <jackyu@google.com> | 2018-06-29 18:50:17 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-06-29 18:50:17 -0700 |
commit | 7bdabe947891a35e29bf624b4a89aa81fcac2a66 (patch) | |
tree | eb61cac8817aaf646cfdef18e70f42d267c92faf /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 082c2014384e1ddf1b9360d3a8b1c6691e875cec (diff) | |
parent | 8f76322f75c43a2d618b808b8a01b2bbaf1570b2 (diff) |
[automerger skipped] Merge "Used APN type instead of APN id" am: 2e371c1b5a am: a916542011
am: 8f76322f75 -s ours
Change-Id: Id0bb6219082d66ca62db3fc7908e3643b1108739
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions