diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-06 05:39:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-06 05:39:52 +0000 |
| commit | 424646cb4dc5ea1ee1e562e077e451177983a5b3 (patch) | |
| tree | b7863e639092b83c6f9f1c511e534da087a96b9e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9d03b1d4e1b0136485d8cb4bbaca0ae767e72702 (diff) | |
| parent | 7e0e17ab0df7ef9c56c2ee879c9b7c0565a4010e (diff) | |
Merge "Keystore 2.0 SPI: Add NAMESPACE_WIFI." am: 07f94fbb01 am: 7e0e17ab0d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564075
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If3005ffbc84c4c6921c154d9ed1ebe2b8866652a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions