commit | 5d734dc3e50ac0dd305d71a91411916f6f92f708 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sun Sep 08 16:25:31 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sun Sep 08 16:25:31 2019 -0700 |
tree | e46c0ea7a249ff779c38de1f76a498989be40885 | |
parent | 180bdfd37da57e308943baf91bae71a237907846 [diff] | |
parent | 519cf9138ddaaaa9ca726ebf067d8614beed4948 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: c25d314f21 -s ours am: 519cf9138d -s ours am skip reason: change_id Ib82af17b8aaceab8357f6ba4280e9ec4d8eb4772 with SHA1 b6ad196f34 is in history Change-Id: I963922b5192333f6ea0599177cebf5f0e768f479