commit | 60c8d2fdf79dbdd3952a142b2f83f46b592656c7 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Oct 31 15:12:08 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 31 15:12:08 2019 -0700 |
tree | 83bc9577f39d067ea79e43e71c35cf773a128efb | |
parent | e44378de5f60178bdeccd43e4f3e311fd9f56a03 [diff] | |
parent | ba71614e79a8fd52aec2034fc0554eba74add8b4 [diff] |
[automerger skipped] Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master am: 76b2ca4bfc am: ba71614e79 -s ours am skip reason: subject contains skip directive Change-Id: Ifcedef06640333867d1d7591a44bcf255ae7653e