diff options
author | Brad Ebinger <breadley@google.com> | 2021-02-02 19:05:07 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-02 19:05:07 +0000 |
commit | e053159612920728988ead21ace603af8fe397ef (patch) | |
tree | 31c5c7b4eebea8c14fdb890976dfe2ee45258051 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 84e0d68f062e6ae765896380872e4a4ae5675cd6 (diff) | |
parent | d1a4eec02009b6357e2483d441cb2c3a49487c64 (diff) |
Merge "Add SIP configration Bundle keys for UA and CNI" am: 5c389e2507 am: d1a4eec020
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567734
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If4cf04ca73239f84644edb654b6dc937505570ea
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions