commit | 309f7e5467591ea3cad13be7840f97c2f9c0d764 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Sep 11 14:50:37 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 11 14:50:37 2019 -0700 |
tree | 5f0b6e1c68fd594e8358f86787d07a3c76a068c7 | |
parent | 579a74ac0d2c95b22e7ad0d412b1f0ad96d4e25a [diff] | |
parent | f52a3a79cd2ad0a40ecd98e63eaaacbfb922c4c2 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: cfaf477e54 -s ours am: f52a3a79cd -s ours am skip reason: change_id I971ea1db5b37fca8a651cba85ba12c44d13e07c1 with SHA1 979aed6d01 is in history Change-Id: I0dd5a8de8da98c1f1a6cc164499508be4b6d3cde