OSDN Git Service

am 28a4f1fd: (-s ours) am 568c167b: (-s ours) am 8b046c1a: (-s ours) am c493f042...
authorGeoff Mendal <mendal@google.com>
Tue, 4 Aug 2015 01:23:44 +0000 (01:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Aug 2015 01:23:44 +0000 (01:23 +0000)
commit109e329bbd43aadfa921fa8d34089099b5a7d233
treecedcdc410c4f72dbeb8e39b89ff3ddc105302b42
parent1af973b26cff00663fe54dbf8e4d98234a4ceb5e
parent28a4f1fdf7eefd0ad134d0a4caccdb0d61d07ddb
am 28a4f1fd: (-s ours) am 568c167b: (-s ours) am 8b046c1a: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE

* commit '28a4f1fdf7eefd0ad134d0a4caccdb0d61d07ddb':
  Import translations. DO NOT MERGE