diff options
| author | Xin Li <delphij@google.com> | 2019-09-08 16:23:27 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-08 16:23:27 -0700 |
| commit | c0378db17a7e5b85cb006074a65949f232dd8b2a (patch) | |
| tree | 0e3600a80cd4c3877072c5175132c350fddd287a | |
| parent | 7e4ad843bf35e3cc3be5a1c627c9d9bf921abdd0 (diff) | |
| parent | 9af2f3bf699a0693fd5ce0ed522db34734b6ac7e (diff) | |
| download | media-c0378db17a7e5b85cb006074a65949f232dd8b2a.tar.gz | |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 82e4d0f00d -s ours
am: 9af2f3bf69 -s ours
am skip reason: change_id Id34b9a5175c55e22b1c2f2d1b3fb62a7e5f497d6 with SHA1 6e57c01c49 is in history
Change-Id: I833b0e7d64d807cf02fef53fa779ee080be029c8
0 files changed, 0 insertions, 0 deletions