commit | d6680563ee5c7475393f762e366944744fce9cf5 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Oct 31 14:56:47 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 31 14:56:47 2019 -0700 |
tree | 4961bd3dec3fda28ef89691e6c23276de107b19f | |
parent | b30344f241003be53631c42cb88b432d70b2bf18 [diff] | |
parent | e244cd4802d8560c78ce3a28cf50f431a457aec4 [diff] |
[automerger skipped] Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master am: abc015499a am: e244cd4802 -s ours am skip reason: subject contains skip directive Change-Id: I5737c9310055502c4736dd58b38137e4119be833