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