commit | 9fef1689dbe3636c79828236d22c487a91fe5d94 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Sep 11 16:56:47 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 11 16:56:47 2019 -0700 |
tree | a3da86e55128f906818c00b9c2efcfa78dd049e9 | |
parent | 57e4063d3827b9acf98b64fe8906a0892a121cbd [diff] | |
parent | e153774a5e1175e68bae85750aae28ff4fae74c9 [diff] |
[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master am: fdb43e49e9 -s ours am: f9030a12e5 -s ours am: e153774a5e -s ours am skip reason: change_id I971ea1db5b37fca8a651cba85ba12c44d13e07c1 with SHA1 979aed6d01 is in history Change-Id: I6cfe24b8be5fbab556e8a725ed5394a53878ea2e