diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-11-18 16:44:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-18 16:44:50 +0000 |
| commit | 2eb526a1ae9b38aa5f15a957b421688269c98a00 (patch) | |
| tree | 33278cd257ba40e1560f9ab3a7f8bb1b577431db /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 34cbddb1394a7d0d4d5f39a325ab15ba0a8dcaf7 (diff) | |
| parent | 2694b808b223749160a22a1ea09deefe767266c5 (diff) | |
Merge changes from topic "ks2_with_keymint" am: ab1b8a7a20 am: 2694b808b2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475676
Change-Id: I877255fe782f7536a92ebdc3bf1fe6df9ec6dff5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions