commit | f4c13b7615659bcb934d28a8aeb47d0f6a9dc1e3 | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Wed Sep 11 15:37:40 2019 -0700 |
committer | android-build-merger <[email protected]> | Wed Sep 11 15:37:40 2019 -0700 |
tree | 1160168b4c8a3d2716357815fe5e247a5fbcae12 | |
parent | 8b7c88548e43109e1344049ec8082f9573600189 [diff] | |
parent | 42347d06d28e140071bd4bfcff7d2ef3623a1a62 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: c96a461f44 -s ours am: 5cfeebde5c -s ours am: 42347d06d2 -s ours am skip reason: change_id Ibf179a62668a4bff6d28a125cfb84a4c7c5fceb3 with SHA1 018b39295e is in history Change-Id: I82c34de658f017797ce09d1c038ac570ad20984d