commit | 1c4540e22247716ae29cd88528959c9a37d9e344 | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Fri Mar 20 23:24:29 2020 +0000 |
committer | Automerger Merge Worker <[email protected]> | Fri Mar 20 23:24:29 2020 +0000 |
tree | 90b860ae83295a988a4abd3eaf022e45a70e86be | |
parent | c7e46349d26a75824457ef9f5e9e67f2a63a7a8c [diff] | |
parent | 50b9b4f625a902a03d595bc8b9ac61c2f4da0fb7 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: d4eef49c06 -s ours am: 82e0a5abfd am: 6e523d84f6 am: 50b9b4f625 -s ours am skip reason: subject contains skip directive Change-Id: Ibe48c44c3966786848fb72cabbc96453de0ecd53