OSDN Git Service

am bd74dff8: (-s ours) am a377ea1c: (-s ours) am 130fc5ca: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Mon, 2 Mar 2015 14:26:10 +0000 (14:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 Mar 2015 14:26:10 +0000 (14:26 +0000)
commit2315ee5903891bc07dd5a611e0d2ebb79b306b2f
tree71db90e4337f807ac836a3d7948b2d5856db4bf4
parent32e40e70497fdf7e1c7f3b3cb871db8c59bff0c9
parentbd74dff8b451a7099beb6cacc54f1062d58b5054
am bd74dff8: (-s ours) am a377ea1c: (-s ours) am 130fc5ca: (-s ours) Import translations. DO NOT MERGE

* commit 'bd74dff8b451a7099beb6cacc54f1062d58b5054':
  Import translations. DO NOT MERGE