diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-08 16:08:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-08 16:08:47 +0000 |
| commit | f41a01c8d21cee8912fd6e0b181d8ba86987dff4 (patch) | |
| tree | 9f661596f7e3f1e634dbc6d1a965cb365d9a12f2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a644b688927fd5cd27b5e983a21a15c1356bbd4c (diff) | |
| parent | b956f8b6f08f973a42b111c403319d87871f8df3 (diff) | |
Merge "Keystore 2.0: Silence common error on operation abort." am: 492ab3dd2c am: 11cb680764 am: b956f8b6f0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic0216e28a74d9583eb6509488909449bc48e5dfa
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions