summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorNazanin Bakhshi <nazaninb@google.com>2019-03-09 08:15:15 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-03-09 08:15:15 -0800
commit4509929509d47ee06dc171a1ad152549b3599708 (patch)
tree62efd7b5443bbb976fbaa8995691a3a421a4527d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1f71a6a273f7602b849e83d82eeb05edccb85fbe (diff)
parent8a95207b86a4397835a8cb4bd43e4fd5a8eeffc5 (diff)
[automerger skipped] Merge "update getStaticPhoneCapability to use HAL instead of default value" am: 9e6f5d1521 am: 109f4590ca
am: 8a95207b86 -s ours am skip reason: change_id Ic40921679ade1f9be42f2bc3d5170ba201dbab5a with SHA1 1772247b04 is in history Change-Id: Ieac24e725bae945aa0023fd72350612d5812c77a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions