OSDN Git Service

resolve merge conflicts of c9badf1 to nyc-dev-plus-aosp
authorChih-Hung Hsieh <chh@google.com>
Mon, 16 May 2016 19:41:30 +0000 (19:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 May 2016 19:41:30 +0000 (19:41 +0000)
commite08ba2f9883d0954c0adc32494fadd951a9a4ab0
treee2d5e6a9727b0884187feff68d16c8b5269bf7be
parentc0523c02e43cc31aa23d2d38058b53c0dc9d908f
parent78e2c9c17f922cd2c8b3116fa6b228ea990d8f4b
resolve merge conflicts of c9badf1 to nyc-dev-plus-aosp
am: 78e2c9c17f

* commit '78e2c9c17f922cd2c8b3116fa6b228ea990d8f4b':
  Fix misc-macro-parentheses warnings.

Change-Id: I78cd4684a0cc020c6f85343f886b3868d7022c17
libril/ril.cpp