| commit | 688e15c9fb3964612fcd39917c9952dbcdd4e2ad | [log] [tgz] |
|---|---|---|
| author | Ben Chan <benchan@chromium.org> | Fri Jun 29 19:38:00 2018 |
| committer | Ben Chan <benchan@chromium.org> | Fri Jun 29 19:41:16 2018 |
| tree | 02e0968c738515aa458a7e39f3ea2c8e92da8b96 | |
| parent | 238c066146896e9caa9e724ce43080d07ac4fb3f [diff] | |
| parent | 0ba75091abd448ccb1fb578ee60d80a60229ddcf [diff] |
Merge branch 'upstream' Merge List: * 0ba75091 - libqrtr: add extern "C" guard in libqrtr.h * a9c50b63 - qrtr-lookup: Add description of service 52 * 4b7025a7 - lookup: fix service name for service type 17 BUG=None TEST=Tested qrtr-lookup on cheza. Change-Id: I7eae9562589f9f9596cad5eb9225a060fb0bc47a