tree bc5a6f51c7fc2315f1f6c2d62db8b1ed6a6466de
parent 1b7cc0d2690dc534562cd070e420baca3c1e7345
parent c02154f862049ee53393705efe2d09bbc1f214fe
author Wink Saville <wink@google.com> 1409791108 -0700
committer Wink Saville <wink@google.com> 1409791108 -0700

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