diff options
| author | Xin Li <delphij@google.com> | 2019-07-02 15:26:13 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-02 15:26:13 -0700 |
| commit | a19c3d5980b5ead64b7bb0ac7752a2516a4b2f92 (patch) | |
| tree | 32004465065b431a8ed1c140d25898dee2cee756 | |
| parent | defa62d8d9762b71d8677175144e69343f78610c (diff) | |
| parent | 607f5a086d08fab07258e4b9af9aff50a08d398b (diff) | |
| download | cn-cbor-a19c3d5980b5ead64b7bb0ac7752a2516a4b2f92.tar.gz | |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 2294953742
am: 607f5a086d -s ours
am skip reason: subject contains skip directive
Change-Id: I5618c93952fddf599d3013a890311a95c20fff15
0 files changed, 0 insertions, 0 deletions