diff options
| author | Xin Li <delphij@google.com> | 2019-07-02 15:29:01 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-02 15:29:01 -0700 |
| commit | 495e74e15fed287648636cf404de94061a149e57 (patch) | |
| tree | a1a984e8c94750699cbb0931b59a6d5890a947f8 | |
| parent | 833bb881bfdaa26f1148cc670c1bc374237a9126 (diff) | |
| parent | abad1baa616d69efa98da673448ad6b7a5d92b8c (diff) | |
| download | jdiff-495e74e15fed287648636cf404de94061a149e57.tar.gz | |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 86be9d5e7b
am: abad1baa61 -s ours
am skip reason: subject contains skip directive
Change-Id: I9ba5c7f43dbd9cc7952b9f4e2bc430932a455100
0 files changed, 0 insertions, 0 deletions