commit | 01548ba25404744c8248cb5f3cd05bdd56cd4613 | [log] [tgz] |
---|---|---|
author | Robert Greenwalt <rgreenwalt@google.com> | Fri Dec 07 12:18:44 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 07 12:18:44 2012 -0800 |
tree | 6a6f010655afedb3b634e1a4a9d97d72dc390a55 | |
parent | 9c0533a8df85bcd1aacc733512f7d3b032e83231 [diff] | |
parent | bc92a28eb36b09326c0502bf2bc1665604183698 [diff] |
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>