commit | 1719082a476934c12bfb93f327718c9e9034b6af | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Sep 11 11:16:46 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 11 11:16:46 2019 -0700 |
tree | 56adc7fae8abc205282479ea2b0848ce2b559a01 | |
parent | 4682952f2528f0c1e81336fe582de96a602f5970 [diff] | |
parent | dc12453a8f8018be6fb65d428229e0d636aa4fe2 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 1fb21efdbf -s ours am: 2c2b81b270 -s ours am: dc12453a8f -s ours am skip reason: change_id I741e3c87515809659392cdc404e5183e4617d82a with SHA1 6854a6f6d4 is in history Change-Id: I709e109270cc53c1a6f444b8613c568ad3f8098d