diff options
| author | Xin Li <delphij@google.com> | 2019-09-08 15:09:30 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-08 15:09:30 -0700 |
| commit | a205ce261766cffe2dd8f9bab7cfcfe036a80803 (patch) | |
| tree | 32004465065b431a8ed1c140d25898dee2cee756 | |
| parent | 2fb9ee030a8b83e3c72877dfbb7f02f1526a3fd1 (diff) | |
| parent | d38204c9c7da5e3da4bd54641ab06aa800471799 (diff) | |
| download | cn-cbor-a205ce261766cffe2dd8f9bab7cfcfe036a80803.tar.gz | |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 18b9201c34 -s ours am: dca0437cfb -s ours
am: d38204c9c7 -s ours
am skip reason: change_id Ic655324c52447411209c7ab8c225af31e3f92241 with SHA1 96f07d819b is in history
Change-Id: I7aa1b9f1e84ce5f574cf7483f28d4ea48edcc5a8
0 files changed, 0 insertions, 0 deletions