diff options
author | Xin Li <delphij@google.com> | 2019-09-08 15:31:05 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-08 15:31:05 -0700 |
commit | dc12453a8f8018be6fb65d428229e0d636aa4fe2 (patch) | |
tree | 56adc7fae8abc205282479ea2b0848ce2b559a01 | |
parent | 17d63fa2424d9db864dd8274f9f8381df0869ac0 (diff) | |
parent | 2c2b81b270f2aa6f4e96fdea505d3e5c09578477 (diff) | |
download | bumptech-dc12453a8f8018be6fb65d428229e0d636aa4fe2.tar.gz |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 1fb21efdbf -s ours
am: 2c2b81b270 -s ours
am skip reason: change_id I741e3c87515809659392cdc404e5183e4617d82a with SHA1 6854a6f6d4 is in history
Change-Id: I83478802f8df583780d1a716e196782f1b160a8f
0 files changed, 0 insertions, 0 deletions