OSDN Git Service

am b145e363: (-s ours) am ba62da99: am fb393f8b: Mark configuration strings as not...
authorEric Fischer <enf@google.com>
Thu, 1 Mar 2012 23:32:22 +0000 (15:32 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Mar 2012 23:32:22 +0000 (15:32 -0800)
commit4d608d75257805e1189cfe1ced8fb9834d6fa552
tree2c9be418dc575ea7b0be621d7d9020d814ddf050
parentd712843b84a4e294516cbcc6386e39b61a913bba
parent4cd9be547f107aebd8b920887cefefbb2fb2e014
am b145e363: (-s ours) am ba62da99: am fb393f8b: Mark configuration strings as not translatable.

* commit 'b145e363ff4e00048cdc9035300a6db05aa0fbb5':
  Mark configuration strings as not translatable.