commit | 2055139148ca28e36141dfb798143892a592df30 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Sep 11 14:49:31 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 11 14:49:31 2019 -0700 |
tree | 8933cb50c96b08d25227fa65d70b55b5e825958e | |
parent | cde9b13b2682d852e803dce314a6a7f7a956bec5 [diff] | |
parent | 6281920563b4930bda993170b022482951ccf250 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: a49538feaa -s ours am: 6281920563 -s ours am skip reason: change_id Iba2b0e6a1bff477aed2f1bbd9b599bbcf2eea942 with SHA1 b1f825f052 is in history Change-Id: Ia592dcd2ace62e527527f1c1ee0be0d69bb5698f