Wink Saville 343feb7019 Merge commit '3432c20c' into fix-merge-conflict ...

* commit '3432c20c':
  Hide SubscriptionManager using individual @hide on fields and methods.

Conflicts:
	telephony/java/android/telephony/SubscriptionManager.java

Change-Id: Ic8d528b7a046f0b2a9735ba62720de142952d7ef

2014-09-03 17:38:28 -07:00

..

java

Merge commit '3432c20c' into fix-merge-conflict

2014-09-03 17:38:28 -07:00