Derek Tan 9b8b72748c Merge "Per API review, revert the API renaming CL." into nyc-dev am: 03d3f4a6cb ...

am: 869f32d810

* commit '869f32d8101862b8c96ecb6cd7317acf0c655c38':
  Per API review, revert the API renaming CL.

Change-Id: I8017702c808b84c8f05dd51ba8c8c0afda8a6b9f

2016-05-26 00:00:49 +00:00

..

android/telephony

Merge "Per API review, revert the API renaming CL." into nyc-dev am: 03d3f4a6cb

2016-05-26 00:00:49 +00:00

com/android

Merge "Add restricted card state to telephony manager." into nyc-mr1-dev

2016-05-25 21:39:12 +00:00