diff options
author | Xin Li <delphij@google.com> | 2019-09-08 14:30:33 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-08 14:30:33 -0700 |
commit | f522dd14c9e38e9183531148171f962213402077 (patch) | |
tree | a1a984e8c94750699cbb0931b59a6d5890a947f8 | |
parent | 0a7ecda99680771c298280b14bf482bbb8a76592 (diff) | |
parent | 3826203ca64ab3a4175dbdb1abbf849abb7fd171 (diff) | |
download | jdiff-f522dd14c9e38e9183531148171f962213402077.tar.gz |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 3826203ca6 -s ours
am skip reason: change_id I5f3596d149f2f4319f780b43f38a1967a6ca2f51 with SHA1 2e4ef0bce9 is in history
Change-Id: Ie5fb78f2f158504959cdb6f5ea7743a45146335a
0 files changed, 0 insertions, 0 deletions