diff options
| author | Xin Li <delphij@google.com> | 2019-09-08 17:36:52 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-08 17:36:52 -0700 |
| commit | 8121c02dfca40299316eed26f5ec5647af74ceb6 (patch) | |
| tree | b041d987051dfefacb55d1e3d78722aa6934be70 /LICENSE | |
| parent | 3b3b08f44da465421e5f70c130a36fa133ce00ee (diff) | |
| parent | 5d734dc3e50ac0dd305d71a91411916f6f92f708 (diff) | |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: c25d314f21 -s ours am: 519cf9138d -s ours
am: 5d734dc3e5 -s ours
am skip reason: change_id Ib82af17b8aaceab8357f6ba4280e9ec4d8eb4772 with SHA1 b6ad196f34 is in history
Change-Id: I935da6ca26163b2bbc6db32aaa8e4903a9f945fa
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions