| commit | 343feb701900f73d882cc7a95ca019333ea55b45 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Wed Sep 03 17:38:28 2014 -0700 |
| committer | Wink Saville <wink@google.com> | Wed Sep 03 17:38:28 2014 -0700 |
| tree | bc5a6f51c7fc2315f1f6c2d62db8b1ed6a6466de | |
| parent | 1b7cc0d2690dc534562cd070e420baca3c1e7345 [diff] | |
| parent | c02154f862049ee53393705efe2d09bbc1f214fe [diff] |
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