diff options
| author | Sarah Chin <sarahchin@google.com> | 2020-11-23 19:29:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-23 19:29:24 +0000 |
| commit | 0f5a38baf4d9a77063dda007b763fa5c8301a13c (patch) | |
| tree | d25c2ac267ef9f01d0e6668ade191d06dede8baf /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | af3c572a3478c3bdf0a98519488d6586a6f2c520 (diff) | |
| parent | 3eb09ed2b3e77f4c3d8d604f1e74e7a9df25b523 (diff) | |
[automerger skipped] Merge "Expose PinResult and ICC PIN/PUK APIs as SystemApi" am: 2391403601 am: 78fa0b0e6a am: 3eb09ed2b3 -s ours
am skip reason: Change-Id I9cdc11c49e4ca602cfa1464e5f424c4a96798cfe with SHA-1 23057fc3f2 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506404
Change-Id: I845aaf2e4aa9a1ed912f91bb816554af5c9a88a4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions