tree 0806e75e2c4003517879dabfd65d7bbee64a69ef
parent df27f4b48204d3166b8e945b23c3e83a81fb1e6f
parent 6bdc4637d7ac1df86e9d745ac483987107a71282
author Niels Egberts <nielse@google.com> 1438790671 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438790671 +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.