diff options
| author | Xin Li <delphij@google.com> | 2019-09-08 15:38:19 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-08 15:38:19 -0700 |
| commit | 519cf9138ddaaaa9ca726ebf067d8614beed4948 (patch) | |
| tree | e46c0ea7a249ff779c38de1f76a498989be40885 /Android.mk | |
| parent | 4740356d3121c8e826cf974800d3ae2315d3df7a (diff) | |
| parent | c25d314f218cedcc7b9ba0fdacc3d81b1fd50aec (diff) | |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: c25d314f21 -s ours
am skip reason: change_id Ib82af17b8aaceab8357f6ba4280e9ec4d8eb4772 with SHA1 b6ad196f34 is in history
Change-Id: I143c0b1dd28ba679bd9917b22a18cd8bef3e34a2
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions