diff options
| author | Bram Bonné <brambonne@google.com> | 2020-11-23 14:42:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-23 14:42:51 +0000 |
| commit | 420816da1f15189cb96a664f421b659e692bdc8d (patch) | |
| tree | 776dfbdabafd73d0aba9b1d0fa343005a835964e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | aedc4ae81c6045de4a2074c3feea960d5edb6835 (diff) | |
| parent | d914fc392585cb84009efa29cbc73138c8e7b649 (diff) | |
Merge "Adds two missing Keymaster definitions." am: 6d7e4c43d6 am: faefa76349 am: d914fc3925
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505232
Change-Id: I4a8d625c0af0229daf0daa65f81159a4f56a0245
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions