tree 5be80b672ca123954bda6bafc43dfb810cc0e91d
parent 7d1a08716ffaeea11190c31157fbede8a7b5c1da
parent 873649482d1c292ebcbf0d2ac526553a01064ec4
author The Android Open Source Project <initial-contribution@android.com> 1364320482 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364320482 -0700

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

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