| author | sqian <shuoq@google.com> | |
| Mon, 16 Jul 2018 17:04:49 +0000 (10:04 -0700) | ||
| committer | Shuo Qian <shuoq@google.com> | |
| Mon, 16 Jul 2018 21:20:47 +0000 (21:20 +0000) | ||
| commit | 57c9e5fc377fe854d48ddbec249a7bc2c7ae634e | |
| tree | f45d7c1dad2cc7a611ea457c5d9e0fe27d04d648 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 375ff6a3a7a0e2d60360fc68e4900535f2422ec7 | commit | diff |
| parent | ccda8d62963b62e80fe1e303c16e75ee9fa274d8 | commit | diff |
resolve merge conflicts of ccda8d62963b62e80fe1e303c16e75ee9fa274d8 to pi-dev
Test: I solemnly swear I tested this conflict resolution.
Bug: 72075328
Change-Id: I8c993cd2fa95c961dc7f976b5bd85a2826b42889
Test: I solemnly swear I tested this conflict resolution.
Bug: 72075328
Change-Id: I8c993cd2fa95c961dc7f976b5bd85a2826b42889
| radio/1.0/vts/functional/radio_hidl_hal_misc.cpp | diff1 | | diff2 | | blob | history |