commit | 8bc1df0883f3774ed41924f04a2c55237770428d | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Apr 10 20:06:55 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 10 20:06:55 2020 +0000 |
tree | d794689a92a53e198ca749692890686bd761d778 | |
parent | 9d4f9e450dffd7b3883abdec524f3e2fb3e66976 [diff] | |
parent | ccb46e16818ce454ad09103c1dd09341b587b4a5 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: 21095c0a13 -s ours am: 6a806bf542 am: cfcef3f0bb am: ccb46e1681 -s ours am skip reason: subject contains skip directive Change-Id: Ia1b478be4e4fc1bf21efa1e8148a8ee6aed426bf