tree 3c056550bd13b55f2c9cc31c305f8a9f5120a60a
parent 1679c0720ad674612b6355c03cdb665a24f41df7
parent ded8fe98b9a10fd7600cf297e2cc4c263965d3ef
author The Android Open Source Project <initial-contribution@android.com> 1364325472 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364325472 -0700

am ded8fe98: (-s ours) am 87364948: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'ded8fe98b9a10fd7600cf297e2cc4c263965d3ef':
  DO NOT MERGE Adding Softbank APN for SIM unlocked device for jb-mr1.1-dev