diff options
author | Amit Mahajan <amitmahajan@google.com> | 2019-11-03 09:54:49 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-11-03 09:54:49 -0800 |
commit | 872c7ef484216e6edc68861d3158ee3b61439877 (patch) | |
tree | b67aeb6420a66cdfe6662a304291b81d8872f2e0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b02a14b18c77c12c9bb5b62b92257d7c6ad25894 (diff) | |
parent | f7181f3c6919beee2f46ce7f6eff042cf6e9deb9 (diff) |
[automerger skipped] Merge "Create frameworks/base/telephony/common for common non-mainline telephony code." am: b14b8bf449 am: 4992cdab07
am: f7181f3c69 -s ours
am skip reason: change_id I0d92ed3fca1fc186484ea8d3c5d17b6e332e7d22 with SHA1 d355153dcb is in history
Change-Id: Iafb75761b891f361b534617244fa0a970d790b29
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions