diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-10-13 13:35:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-13 13:35:56 +0000 |
| commit | 6e4e897c7782319141bf850e81f4ebf15d7dd584 (patch) | |
| tree | 99d20e5db73ca014d800be37ab3bbb1776f40522 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 102e8bf3b51d0782fb444abf055c22363d4a9582 (diff) | |
| parent | 80dc50df379befecde48ea5fb6b36dbdd9861ac3 (diff) | |
[automerger skipped] Merge "DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes." into rvc-dev am: e3a263bb6d am: a68d603483 -s ours am: 80dc50df37 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15900956
Change-Id: Ibd4e75945bbabe48c8e0d00c8cd515ad482bc480
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions