tree 3f8aa88578a54fe56a68de5b01cc859e68c44021
parent 315cd9a86f5ef341820a4eddf837e3070c5d0a5c
parent 65512b664d7a0c6c2a6e2c7c1f44e3d84d1afc0f
author Treehugger Robot <treehugger-gerrit@google.com> 1619649118 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619649118 +0000

[automerger skipped] Merge "Remove libsurfaceflinger_unittest from root TEST_MAPPING" am: 82261324f2 am: f183eef4d3 am: 65512b664d -s ours

am skip reason: Merged-In I99f9fdf5e75dae686f958e97e9685d1a00166877 with SHA-1 64ef146e58 is already in history

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

Change-Id: I1dbb1e371c10cf55cd5a3fc6afbd0d0f97d6ba0b