tree b3fe0c57cecf5e0deaa53771259af18058e88a17
parent 5a379607ad1e40ba99add31e44628d2b10f85df1
parent 483637a524b06592323ccfd6e6b2f326ffa6e1c4
author Xin Li <delphij@google.com> 1566850994 -0700
committer android-build-merger <android-build-merger@google.com> 1566850994 -0700

[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: bc7898323c -s ours am: b3aeafddca am: 8fb95b5ae3
am: 483637a524 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib3e1a41f90719bb4cc34a385f285db9d82cb9cd0