tree 1d4aa70419bdf0720350c7d1b3cdf111d04cc025
parent 7bd5ce3e1430ae415d61a20548561b2092a9fe51
parent bd140dcfaeb5bbe184aa289197c7ea08b5412be8
author Xin Li <delphij@google.com> 1586492865 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586492865 +0000

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d7bdb508ed -s ours am: e7fe683339 am: 276d6dffe0 am: bd140dcfae -s ours

am skip reason: subject contains skip directive

Change-Id: I319631af2ac36749d3537f25ec7cdfa34adb09e7