Commit 1c4ff813 authored Jun 08, 2020 by Xin Li Committed by Automerger Merge Worker Jun 08, 2020

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: e3e5b30b -s ours

am skip reason: Change-Id Iea2c5fb12ea7b1ad563f540349063fcda557fbc1 with SHA-1 560de158 is in history

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

Change-Id: I6ad7aef5610ae30a68705047baeef51f2e21b477

There are no changes