OSDN Git Service

resolve merge conflicts of 345a396c to oc-dr1-dev
authorsqian <shuoq@google.com>
Tue, 1 Aug 2017 19:21:55 +0000 (12:21 -0700)
committersqian <shuoq@google.com>
Tue, 1 Aug 2017 19:25:53 +0000 (12:25 -0700)
commita6e57a9647b98c4ff7dcce3986830218e9d4200a
tree6b294c925f94e3f570e2d77a41ccbdfdbfcc1f1e
parentec37054b9e369f06adb34124c1465d480c8fdc3d
parent345a396c18e61ba587bdafb15fdafbe27e0f3c82
resolve merge conflicts of 345a396c to oc-dr1-dev

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5d816e17b2c8b113d07bf5e827d8c9378af761d9
Merged-In: I5d816e17b2c8b113d07bf5e827d8c9378af761d9
radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
radio/1.0/vts/functional/radio_hidl_hal_stk.cpp