commit | 7313181cb1942a0a5bb9c1d46061c717137885f1 | [log] [tgz] |
---|---|---|
author | Lucas Dupin <dupin@google.com> | Wed Jul 15 20:20:54 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 15 20:20:54 2020 +0000 |
tree | b4b6fae6de5e8d0103c22b0cd0f4e4f164b4eaa4 | |
parent | b97bb2f109e2befe61ef6c19dae4a899cc430bf3 [diff] | |
parent | 8d2869811b13eaf05cad5ec26688f3855ac9de8c [diff] |
[automerger skipped] Merge "DO NOT MERGE Fix broken test" into rvc-dev-plus-aosp am: 0d050d0f5d am: f7548e26e1 am: 8d2869811b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12154028 Change-Id: I3168bf1d14379ed35c2f4063743b4e21039f7579