diff options
| author | Xin Li <delphij@google.com> | 2019-09-08 15:18:12 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-08 15:18:12 -0700 |
| commit | e96e8ac0ca23d1306d91510d72de2fab0bfdf93d (patch) | |
| tree | 530205f296e2c536bdd636cdfcc3262c72dccfd7 | |
| parent | 7706dce61d584c276a84f0bc2efb239ad21f81a1 (diff) | |
| parent | fe17dcff568dd5639e66dae59a6f328fc55537bc (diff) | |
| download | parameter-framework-e96e8ac0ca23d1306d91510d72de2fab0bfdf93d.tar.gz | |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: fe17dcff56 -s ours
am skip reason: change_id I146585370eb23d63bc0e653083a5d74b795862dd with SHA1 0ae3d12584 is in history
Change-Id: I7725d36f63551a3be8e5f93fd89f18dd2f9797f4
0 files changed, 0 insertions, 0 deletions