OSDN Git Service

am 94b5278e: (-s ours) am 6bdc4637: Merge "NPE occured when trying to parcel voice...
authorNiels Egberts <nielse@google.com>
Thu, 27 Aug 2015 10:00:34 +0000 (10:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:00:34 +0000 (10:00 +0000)
* commit '94b5278e6587e9d62398eb3bc5b31218363c86b7':


Trivial merge