OSDN Git Service

resolve merge conflicts of 0e50326a to oc-dev-plus-aosp
authorsqian <shuoq@google.com>
Wed, 31 May 2017 22:27:25 +0000 (15:27 -0700)
committersqian <shuoq@google.com>
Wed, 31 May 2017 22:27:25 +0000 (15:27 -0700)
commit4e49d8d43bfab8867f5c2fbeefc41eaf6f9963e3
tree35f60ee42aad1689ee6239dff17500f929c05278
parentd40b89d117a6bd6aa7e2ed17d19b44e7e57f1659
parent0e50326a404b20c2d3d5e559d8c6385f9c27379f
resolve merge conflicts of 0e50326a to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I91fb2abbee5db431e8dc5dbfc8fc9fe0b9179b0c
radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
radio/1.0/vts/functional/radio_hidl_hal_utils.h