tree 6a6f010655afedb3b634e1a4a9d97d72dc390a55
parent 9c0533a8df85bcd1aacc733512f7d3b032e83231
parent bc92a28eb36b09326c0502bf2bc1665604183698
author Robert Greenwalt <rgreenwalt@google.com> 1354911524 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354911524 -0800

am bc92a28e: resolved conflicts for merge of d71914ed to jb-mr1-dev-plus-aosp

* commit 'bc92a28eb36b09326c0502bf2bc1665604183698':
  Add new APN values for a new operator (Hot Mobile) in Israel. Signed-off-by: tal <talkarliner7@gmail.com>