diff options
| author | Baligh Uddin <baligh@google.com> | 2020-12-24 07:01:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-24 07:01:55 +0000 |
| commit | a5edace4ab234cb25777fd1ccec1d8696edac2d5 (patch) | |
| tree | 4217df3801c26136426ba740be61323d2ad48e58 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 36d9d8e4520d2140be2735e80e3666f45b1d4abf (diff) | |
| parent | a57f85b7337bd40ea22599052d4324e7e3d421fd (diff) | |
[automerger skipped] Merge "Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin" am: e41cd2917a am: dc68043ad0 am: a57f85b733 -s ours
am skip reason: Change-Id I9031a37c84e17c2cf5c0552d1b33e8fd59216b92 with SHA-1 dcab236e8a is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533852
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I492101fb4f28555091631f196763566c3d4243e9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions