commit | 059c27ce5aa6eab28868826c525307332c9923d1 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Mar 20 18:45:26 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 20 18:45:26 2020 +0000 |
tree | b36dc83c3175ee21a0a3442078dc42a8fa3d3aba | |
parent | 7f9962a90e7d92efef1639af6180466e24a572d8 [diff] | |
parent | 5de870be1dd299e36076b9cc39b1837da88a2ef1 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 530a08c526 -s ours am: 5de870be1d Change-Id: Id114aa61ab305ad1969814630af2868bf9a91cff