Jeff Sharkey 284eab179c Merge "Migrate plans to @SystemApi, evolve permissions." into oc-mr1-dev ...

am: 2c131cafae

Change-Id: I1f1d834712004b520a02d3116de945c668236f81

2017-07-30 00:15:17 +00:00

..

android/telephony

Merge "Migrate plans to @SystemApi, evolve permissions." into oc-mr1-dev

2017-07-30 00:15:17 +00:00

com/android

Merge "Change IMS callback AIDLs to be oneway" into oc-dr1-dev am: cfcac665c1

2017-07-27 23:03:54 +00:00