tree 6e5022827cda1f4a8ca14b2782c251093f0784b0
parent 9503a00c587bff45d09206af309abc87b8f138df
parent db2e05d89e0b99b226fce9cc3af8552745f5e4ca
author Wink Saville <wink@google.com> 1416515266 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416515266 +0000

am db2e05d8: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev

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