commit | 2c902d451cd80b9efa36b63b72a2f284fc361346 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 02 15:55:06 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 15:55:06 2019 -0700 |
tree | 6a2051445cc6646463d9f939b83b86086f3a14ed | |
parent | c342ef11f1756b319a550a223d22e14c5792f0d5 [diff] | |
parent | a996178017d964b2a9a00af8e87fb006c2864ca0 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: c3cceffa06 am: a996178017 -s ours am skip reason: subject contains skip directive Change-Id: Ia47757c0e66156aac9af0ef99a08ba5c790dcc3f