OSDN Git Service

resolve merge conflicts of 13c5c34 to mnc-dev
authorChristopher Tate <ctate@google.com>
Tue, 6 Dec 2016 00:06:18 +0000 (00:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Dec 2016 00:06:18 +0000 (00:06 +0000)
commitabe293b9508d82de9a161279ab0a7c57196b3842
treec4637856df8aeec2b0663370ffc7bc5012494899
parentaff7827b4fb561f552a2da15ced8c30addfe4d08
parent79b74d787daa32d5e5d191e653b011d45d7f846c
resolve merge conflicts of 13c5c34 to mnc-dev
am: 79b74d787d

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