OSDN Git Service

am ce1bfbb0: resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp
authorSanket Padawe <sanketpadawe@google.com>
Fri, 10 Oct 2014 05:15:52 +0000 (05:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Oct 2014 05:15:52 +0000 (05:15 +0000)
commitea2e53ead56bc3bce765581f06a1c9e043a5e46c
tree87fab0aa868fced958890336f7553800ca6f4637
parentb7a635f66df8292bd45300f37eb27368af9e5e1d
parentce1bfbb04e75a9b4362b2f3070ff4ee5406f136d
am ce1bfbb0: resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp

* commit 'ce1bfbb04e75a9b4362b2f3070ff4ee5406f136d':
  Removing display number format from SIM UI
res/values/arrays.xml
res/values/strings.xml