OSDN Git Service

am 4335d35c: am 9ea09757: Fix broken error check in Parcel::readBlob
authorNarayan Kamath <narayan@google.com>
Mon, 27 Oct 2014 04:18:27 +0000 (04:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 04:18:27 +0000 (04:18 +0000)
* commit '4335d35c71e777d42fbe8d53fa6b8fbc95d4c2b7':


Trivial merge