tree 49304059b9d9cf2f15b1ad93c52aa449661b44f5
parent db38041002c6c9f297e8c8c1eade6471646045b2
parent 64cb35c078d58d9025d2f14b3674ca59f2e6d80b
author Robert Greenwalt <rgreenwalt@google.com> 1349814649 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349814649 -0700

am 64cb35c0: Merge "Add config resource to help ATT prepaid" into jb-mr1-dev

* commit '64cb35c078d58d9025d2f14b3674ca59f2e6d80b':
  Add config resource to help ATT prepaid