Jonathan Basseri cb9dc98cb8 Merge "DO NOT MERGE Revert "Convert ICarrierService to oneway."" into oc-mr1-dev ...

am: 7bd96d32a1

Change-Id: I0566980aa480c50fa785465b08a40ba40d6c7520

2017-10-20 03:01:14 +00:00

..

android

Merge "DO NOT MERGE Revert "Convert ICarrierService to oneway."" into oc-mr1-dev

2017-10-20 03:01:14 +00:00

com

resolve merge conflicts of 5c9e47d28b to oc-mr1-dev-plus-aosp

2017-10-19 15:33:17 +00:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…