| commit | 075465bcd2df2fdf4e54bce3416aa626fe7a3321 | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Thu Jan 19 22:59:58 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 19 22:59:58 2017 +0000 |
| tree | a26d25f9340f3e619e343b5820ce7df51ad4902e | |
| parent | 7fb7878774c47a100e398075853e6538331bba96 [diff] | |
| parent | 6c70ca43700e40a706a9eec79f3a105f7a5a5682 [diff] |
Merge changes from topics 'id_str_supplicant_hidl', 'p2p_wps_supplicant_hidl' am: 6f7de57928 am: 615d5ce693 am: 6c70ca4370 Change-Id: I672a6db9bdb6c3c4711a6ffdb705bdea53e86779