tree 6a56dc71b6ce8be84d43b3cd602871aa0eb45d44
parent 0b10f9c0ab9a6c4003a2a300c2a38f7ca2144fdb
parent 4f1cce63061976490e2e2cfc4085e1634d3a02de
author Wink Saville <wink@google.com> 1416852369 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416852369 +0000

am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev

* commit '4f1cce63061976490e2e2cfc4085e1634d3a02de':
  Additional changes to SubscriptionManager API as per API council.