tree 41210b81af3f37bf859c484ba58472b3b4c5dece
parent df76f611528877512e0f9d51508d36f5435bb9e8
parent 70e1b90b0d1f37efcdf526fcf723ebda7b2b766c
author Treehugger Robot <treehugger-gerrit@google.com> 1598335029 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598335029 +0000

[automerger skipped] Merge "Merge stage branch to development trunk." am: 70e1b90b0d -s ours

am skip reason: Change-Id Ic44b98572611891b4e28c086035bab2d0f2565d7 with SHA-1 df76f61152 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1409197

Change-Id: I23aa146e45280841a039c5345f5882224843fb3b