commit | 48125ae3a13209654db0faf52df1fedcc9d51c18 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Sep 11 14:50:13 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 11 14:50:13 2019 -0700 |
tree | 2d29ccd895e25e03eab083732f2618703e8b91da | |
parent | 74385edac2c290593348b5efca876f29009a11d7 [diff] | |
parent | 77b96d5491e1422e3a5110cf77e934b89b2e1e92 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: c05ccac5cf -s ours am: 77b96d5491 -s ours am skip reason: change_id I4568f81fdeda12ce5c3da86133d42f9b7de7a8b0 with SHA1 e84b02b2bf is in history Change-Id: I7e2539cb1c0751ad8ffb7eb37fead7f1ad3ad091