tree 2250d0ca95b1f4d9737844a407824a5914a4296f
parent 2e1c5e9b0cf88594645171c42e737daf18f95366
parent 2123f2555a53ca9957f50dd396b8e42f1e3e2a81
author Xin Li <delphij@google.com> 1567711092 -0700
committer android-build-merger <android-build-merger@google.com> 1567711092 -0700

[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am: 2123f2555a -s ours
am skip reason: subject contains skip directive

Change-Id: I6cb161d23457b331aa0cb966771425b6e8de2deb