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