OSDN Git Service

resolve merge conflicts of 70b9a03 to nyc-mr2-dev-plus-aosp
authorCasey Dahlin <sadmac@google.com>
Wed, 16 Nov 2016 01:01:46 +0000 (17:01 -0800)
committerCasey Dahlin <sadmac@google.com>
Wed, 16 Nov 2016 01:01:46 +0000 (17:01 -0800)
commit29dedec71a47f721c7bcc28bdd3e1737e40f6f70
tree8e978ede25635467edbfd370278efe46c2cfb2c8
parent1ff500569866920f44b73991b9755b10d49db713
parent70b9a03dc32789d371eccf47ccef00e044649e3a
resolve merge conflicts of 70b9a03 to nyc-mr2-dev-plus-aosp

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