| commit | 60fe381cd633c89272ac528393f48dc4e11f0f51 | [log] [tgz] |
|---|---|---|
| author | Jizhou Liao <Jizhou.Liao@nxp.com> | Wed Dec 13 22:35:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 13 22:35:56 2017 +0000 |
| tree | 4c9c8f33604a70e916a949960b3d56d1c243dc1e | |
| parent | 6af7be555c809549d75e8be4b6a3dc63bb7feaf9 [diff] | |
| parent | 88a83bd30934b59e46087c7e12bb02295cd93277 [diff] |
am 06c96794: am acf1ec0c: Fix conflict vendor proprietary Protocol and Discovery technology definitions am: 60cfbbcb61 am: 528c924582 am: 88a83bd309 Change-Id: Ida9608cb2d90cda0df66d63928462b801007059d