diff options
| author | Xin Li <delphij@google.com> | 2019-07-02 12:51:42 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-02 12:51:42 -0700 |
| commit | 8c14cab0245a6f06c4ca82b57ff1f9f14c17d24a (patch) | |
| tree | 56adc7fae8abc205282479ea2b0848ce2b559a01 | |
| parent | c404e0140287f20d98b19e4fc8586c93cc489dd5 (diff) | |
| parent | 06a168d2a41cfc0609a92f770471cd2ed6ae7360 (diff) | |
| download | bumptech-8c14cab0245a6f06c4ca82b57ff1f9f14c17d24a.tar.gz | |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 3ef18c7fc6 -s ours am: 3f4c514472
am: 06a168d2a4 -s ours
am skip reason: subject contains skip directive
Change-Id: I4247e895a0bc3ad84faa2ebbee074c79891040a2
0 files changed, 0 insertions, 0 deletions