diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-03 03:36:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-03 03:36:08 +0000 |
| commit | 7a8917da54589079da89954bbbf748a206f45d06 (patch) | |
| tree | 5aca055ae8d1f87af6627a8764bc966f33f93612 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3c18d99b2b65ae3b34ba8d24dd9a6b5442d69756 (diff) | |
| parent | b6399c9f2ba8f39e653d3e473d44a64529750cdc (diff) | |
Merge "Merge "Merge "Fix Bundle#getParcelableArray call" into rvc-dev am: d70c7dda50 am: e7322068cc" into rvc-d1-dev-plus-aosp am: fd99d382b2" into rvc-qpr-dev-plus-aosp am: b6399c9f2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034230
Change-Id: I351af00101847c96e8543c815b4d88950415197c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions