tree a2b64a815b3c1006081a6169ca54d3d6c9b62df6
parent 1c53c20c276d98e5bb37f1351063368debcf3783
parent 93fc415e6219f59a5b1f2d6fd5e1647551a27742
author Wink Saville <wink@google.com> 1415763930 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415763930 +0000

am 93fc415e: Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 43bbf30 automerge: e76308c

* commit '93fc415e6219f59a5b1f2d6fd5e1647551a27742':
  Update SubscriptionManager API as per API council.