diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-16 03:28:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-16 03:28:00 +0000 |
| commit | e7f2887e7d25554a9fdb2e0fa7dc125aa3ab3859 (patch) | |
| tree | 842d6a073630d573d7511e13881fe82718825da4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6242135e1b8d31251a74b05920d6964cc92840fa (diff) | |
| parent | bf415409e81982c9678f15c1577aee0c6e977544 (diff) | |
[automerger skipped] Merge "[Telephoy] Add phone Id to support DSDS" am: 40fa3f58b2 am: 36fb168817 am: bf415409e8 -s ours
am skip reason: skip tag Change-Id I6bf2285e37366ca517a3ea16194a203371e44964 with SHA-1 1835f13c4e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676437
Change-Id: I5aec4568e35a02b0195837f9f88d1f4eda10b6c4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions