diff options
author | Jordan Liu <jminjie@google.com> | 2018-05-11 10:58:29 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-05-11 10:58:29 -0700 |
commit | 8a45cb68a2d07b1d1a211d4677293e85e9a74a40 (patch) | |
tree | 66a2ce1521ef3a37213c0c25e92ba1fc1aeef385 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | f7e7b1d3756211c1a810145407e62e5f0756f6a7 (diff) | |
parent | e9a3356c31f77fcfc0ad1a51afafb2f8958277bb (diff) |
[automerger skipped] Merge "Add Carriers.APN_SET_ID and NO_SET_SET" am: cdb29f97db am: 87a0844d12 -s ours
am: e9a3356c31 -s ours
Change-Id: I00f345b9f69d47a7dd8f33326bdd50bf4d1d75e3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions