tree 8ed2eb5729267882eea208df9db1b47ed0dddf96
parent 0df5805d21e7794e9e7543116c67eb745beaf387
parent 5ac14106ffd32cf64971e907499329391b281e90
author Xin Li <delphij@google.com> 1566617120 -0700
committer android-build-merger <android-build-merger@google.com> 1566617120 -0700

[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
am: 5ac14106ff -s ours
am skip reason: subject contains skip directive

Change-Id: I2f78ea8d7588dafe0bee2a4cab198f4b02395b15