diff options
author | Xin Li <delphij@google.com> | 2019-09-08 15:28:18 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-08 15:28:18 -0700 |
commit | d3a7d81529abf90eb20b003f06ae509d203b5d4e (patch) | |
tree | 575acabef65520971bdb4eea77dfbe3fd7e97241 | |
parent | a0c1151cebe05780f646591c13be44f2a08283d4 (diff) | |
parent | 3b4b8969a03a50839527e2d056671a81ab8a8679 (diff) | |
download | TvSettings-d3a7d81529abf90eb20b003f06ae509d203b5d4e.tar.gz |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 7fedc060e0 -s ours
am: 3b4b8969a0 -s ours
am skip reason: change_id Ic5fecd7073f550f977d76aaf709382e23402421e with SHA1 291192397d is in history
Change-Id: Ic32b9da4428515a370d708b751413df600c2565b
0 files changed, 0 insertions, 0 deletions