diff options
| author | Nikita Ioffe <ioffe@google.com> | 2020-12-23 13:49:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-23 13:49:10 +0000 |
| commit | cf749b91549aab68a28de6e1b467fb2f6536a34a (patch) | |
| tree | cb25c42018ad126522513c0927e373e21b0348e4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 68e25d8da01338dcaeb76218b6312ea3c65f1624 (diff) | |
| parent | 85de24f37f7263084d23dd4e2f02813ec074f736 (diff) | |
[automerger skipped] Merge "Fix ApexManager#snapshotCeData (3/n)" am: 3a9796a8c6 am: 299da8f790 am: 85de24f37f -s ours
am skip reason: Change-Id I10ed0e3adef88a27ee239c183d99a836b623d0d1 with SHA-1 6d8e4e5a40 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535142
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I70dbc6cca301cd27a913e021a6ffa9ad017bf858
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions