diff options
| author | Grace Jia <xiaotonj@google.com> | 2021-02-01 19:51:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-01 19:51:02 +0000 |
| commit | 6de81a4c5daf64f5ffcacb57a8ba1de2c5d8855b (patch) | |
| tree | c0b5e003377ff86d4ccebae85ef3b9f6cc44e717 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 71205b134e15994b3b3e41fc0c97c2e763084d91 (diff) | |
| parent | 3771f5e563d7bd60479fa0f3bb0d20b458704ca4 (diff) | |
[automerger skipped] Merge "Add relative APIs for InCallService that can support self-managed connections that want to expose itself." am: 59c47d24fc am: f5468331b4 am: 3771f5e563 -s ours
am skip reason: Change-Id I0a42ea79a1cd46aa9df3399c4fa2e9396321778a with SHA-1 e99fde9678 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526998
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib01ce355d09a32c23e158defc2863396052627a3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions