diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 22:15:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 22:15:25 +0000 |
| commit | 665de46b8c6dac5fb7b58d5a06763f1427b1df5a (patch) | |
| tree | 497dc4b2aba7e0108b30b5b0d59e1aca1f582972 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | cafffe16868ad5c034b94943b87eb6ed039928a1 (diff) | |
| parent | 5ccdb225a037ddfaaab560de1e48aba202660664 (diff) | |
Merge "Merge "Merge "Reparent PiP to split screen on exit" into rvc-dev am: 11affeca99 am: 20dffe011a" into rvc-d1-dev-plus-aosp am: 31d23ee796" into rvc-qpr-dev-plus-aosp am: 5ccdb225a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11973248
Change-Id: Ibad064e8ba018349898570d758b9c9af69f4b2ab
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions