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)
commita08365d61aa05e68fb6ea5afc24704d6efc4f0cf
tree77d13d808b174d59932dbfb2cbc211a141e65cf1
parent7b1d7e46f9429a7bb82142da461223016361224c
parent3e44cad56c566a40f2b8e78ae6a22bc9980dcca2
am 3e44cad5: (-s ours) am adf70222: (-s ours) Import translations. DO NOT MERGE

* commit '3e44cad56c566a40f2b8e78ae6a22bc9980dcca2':
  Import translations. DO NOT MERGE