OSDN Git Service

am 3e44cad5: (-s ours) am adf70222: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 25 Nov 2013 21:11:21 +0000 (13:11 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 25 Nov 2013 21:11:21 +0000 (13:11 -0800)
* commit '3e44cad56c566a40f2b8e78ae6a22bc9980dcca2':
  Import translations. DO NOT MERGE


Trivial merge