OSDN Git Service

am 4917bc10: am d31da0a6: am fb393f8b: Mark configuration strings as not translatable.
authorEric Fischer <enf@google.com>
Thu, 1 Mar 2012 23:32:24 +0000 (15:32 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Mar 2012 23:32:24 +0000 (15:32 -0800)
* commit '4917bc104da1725d7ba093713de3802dec1515e5':


Trivial merge