OSDN Git Service

resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d
authorChristopher Tate <ctate@google.com>
Tue, 6 Dec 2016 00:09:47 +0000 (00:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Dec 2016 00:09:47 +0000 (00:09 +0000)
commit02e4440eabb004f8d817599b68caf9dba7aa27bc
treea6699bd25c3d87e7ec129b7217ec20ee965f0ba0
parentc8684d517aeae248b0579ef7fcb4d31ff28e59a3
parentabe293b9508d82de9a161279ab0a7c57196b3842
resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d
am: abe293b950

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