tree 6288367cc263c82fe65d72e31aaed29b4a80a2f8
parent 4d2eec1434f08667999b9cc51e6cf6f7146003e5
parent 6bdc4637d7ac1df86e9d745ac483987107a71282
author Niels Egberts <nielse@google.com> 1438793304 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438793304 +0000

am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev

* commit '6bdc4637d7ac1df86e9d745ac483987107a71282':
  NPE occured when trying to parcel voice features.