OSDN Git Service

resolve merge conflicts of 70b9a03 to nyc-mr2-dev-plus-aosp
authorCasey Dahlin <sadmac@google.com>
Wed, 16 Nov 2016 18:53:13 +0000 (18:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 16 Nov 2016 18:53:13 +0000 (18:53 +0000)
commit971c25b0a34b6c1c8798eae63a94bbc63cc6b71e
treec46ad7f08d1e76e8479f88bba537bfdaf3767645
parent91804d3eca1710063e82e5b65eea68db703eed74
parent29dedec71a47f721c7bcc28bdd3e1737e40f6f70
resolve merge conflicts of 70b9a03 to nyc-mr2-dev-plus-aosp
am: 29dedec71a

Change-Id: I466f01c11ccaf6fe84cbabf4de44bd7485946903
include/binder/Parcel.h