diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-16 03:16:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-16 03:16:18 +0000 |
commit | 6c84521962963a4cf367e1bed229c9f78a154daf (patch) | |
tree | 42e6cea2cd8335426b50add9125e3f65d906b600 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | aed773b8195e2a0c3393bb4aa730ee3e3d868912 (diff) | |
parent | a5908b9df1eaea90e9f380aeef59f98e53bb4ffa (diff) |
Merge "Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev am: ac3ce5c425 am: ae3ad24751" into rvc-d1-dev-plus-aosp am: a5908b9df1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817537
Change-Id: I2e9da66bcd1078e3ac2acd32a2691c2af4634f88
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions