commit | de62fa3be9866a2ec860ac3bd911138b0735adfa | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sun Sep 08 16:30:37 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sun Sep 08 16:30:37 2019 -0700 |
tree | 60eb05f2e88de4fce5c0d1574244d042b1357998 | |
parent | 83a1d30af9dbf31710359645d414607f9fb8d1ae [diff] | |
parent | 6a1367ef9e9105986be6dae9953990ce2f288114 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b0e3446028 -s ours am: bd6e32c578 -s ours am: 6a1367ef9e -s ours am skip reason: change_id I9d37ecefcc91ebab3bc798d0deed9e924ca828d3 with SHA1 9b99e6a8ea is in history Change-Id: Ib40a4a0ccc62bca1733a4855e6123def982ed210