OSDN Git Service

resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e44...
authorChristopher Tate <ctate@google.com>
Tue, 6 Dec 2016 00:35:30 +0000 (00:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Dec 2016 00:35:30 +0000 (00:35 +0000)
commit457c5943f1c49d0301bb41a809a7bfcc30e3a897
tree7db736667547b51f268ee66a47967caab34a7c78
parent8d7cc71aa7848e8486c4385bf7251b3b9f85a561
parent6128e113b0e169a48dc4a7fcb93b01f68084f44d
resolve merge conflicts of 13c5c34 to mnc-dev am: 79b74d787d am: abe293b950 am: 02e4440eab am: 953c05276e am: e37a4dc7c4 am: 8ed5e3d7ca am: 9d5dd3f584 am: 9ef37cdcdc
am: 6128e113b0

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