tree 97114fe0e66005223e13a0d39703fdeccbaccea9
parent 3150feef0b27ad34370904eb12875805f6c84e8a
parent ba3cf72a08368ab40556b07b4518536bb59eb2f6
author Wink Saville <wink@google.com> 1347394637 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347394637 -0700

am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"

* commit 'ba3cf72a08368ab40556b07b4518536bb59eb2f6':
  Telephony: Clarify IccCardConstants.State enum