tree 0d15e12f21f79606e4a617fb896a336d90432aba
parent e8b49c433156b450289a4cd7ff1a7c8d7f05ebb8
parent 2e12e0522641649d363a1c6ede9be9af235197fa
author John Huang <jsh@android.com> 1386205758 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386205758 -0800

am 2e12e052: Merge "RIL changes for supporting generic SIM communication."

* commit '2e12e0522641649d363a1c6ede9be9af235197fa':
  RIL changes for supporting generic SIM communication.