Merge "[automerger skipped] RESTRICT AUTOMERGE Ignore testShowHideInSameFrame on T QPR am: 89a5d8301b -s ours am: 1b43f2a2cb -s ours am: fc917ff76c -s ours am: d6bc427fed -s ours" into udc-qpr-dev-plus-aosp am: 537962efee -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21740661 Change-Id: I488f4307a961f793e156851b58369a36a9f82746 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: