Tyler Gunn 2b308b51d2 Merge "Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am: 99d28ebbda am: 8b2e421025 am: c26e534bef" into oc-mr1-dev-plus-aosp ...

am: dfcd7852a2

Change-Id: Iff9efc0b5dbb0593592f95db5924d045cc68d8e1

2017-09-19 17:05:49 +00:00

..

android/telephony

Merge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89 am: 74bd3daaac am: b3bc234dfa

2017-09-19 01:44:24 +00:00

com/android

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

2017-09-19 16:52:09 +00:00