OSDN Git Service

resolve merge conflicts of 13c5c34 to mnc-dev
authorChristopher Tate <ctate@google.com>
Mon, 5 Dec 2016 22:10:47 +0000 (14:10 -0800)
committerChristopher Tate <ctate@google.com>
Mon, 5 Dec 2016 22:10:47 +0000 (14:10 -0800)
commit79b74d787daa32d5e5d191e653b011d45d7f846c
treee4f7979b5b8c52bc2f3831df754b0043e0c3474c
parent275b2347efa92198ce6c69e0cc78ecf7d3c99aaf
parent13c5c34e6ef3e44a18dd8b6c742bad5852486457
resolve merge conflicts of 13c5c34 to mnc-dev

Change-Id: I7f57cde153648f48ff038400aa437b76971d4771
libs/binder/Parcel.cpp