From: Tyler Gunn <tgunn@google.com>
Date: Tue, 19 Sep 2017 16:37:38 +0000 (+0000)
Subject: Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables."
X-Git-Tag: android-x86-9.0-r1~348^2~1^2~3^2~133
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8b2e421025;p=android-x86%2Fframeworks-base.git

Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables."
am: 99d28ebbda

Change-Id: I99ff94901868d3b16a20a6592e106bc0645b863e
---

8b2e42102564b3ce989251b5dc3021207dd186da