tree 54e9fdecc577949e9777076ffa0411b219e7e137
parent 8fb23ab5e273317a8ad2fca1941f7b80bfee474f
parent 4c23c6b7969acca7c33dceeda86cb823fe82ecf4
author Treehugger Robot <treehugger-gerrit@google.com> 1596575931 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596575931 +0000

[automerger skipped] Merge "Use -target 8 for android_uiautomator" am: 4aedb4cdad am: b26e082598 -s ours am: 1e1ae26206 -s ours am: 4c23c6b796 -s ours

am skip reason: Change-Id I6871ab5436232ad3bffff6bd26adf2de6b3c06ff with SHA-1 51387a027d is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388897

Change-Id: I0c0bf45a32c4691b5bdcc8510d75304e6e29be21