commit | 486b29a75fadae85806964b4fc518daec1e04f64 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 02 12:51:19 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 12:51:19 2019 -0700 |
tree | dc032a8ac9921bc5c194bb1f58b012e1c0562eee | |
parent | 199b8b5b8e360629876fa504ee4aa97e840144f2 [diff] | |
parent | cb840c7ef6cc1bdeaa542f2a455a6b6018452a78 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 7b0da3d1f8 -s ours am: 740275fb55 am: cb840c7ef6 -s ours am skip reason: subject contains skip directive Change-Id: Id401da0a8e3079cd57c0672cdbc43fd7fa40d298