OSDN Git Service

am 69fcacc2: (-s ours) am 7ddac827: (-s ours) am 052e50dd: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Mon, 3 Aug 2015 14:36:55 +0000 (14:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Aug 2015 14:36:55 +0000 (14:36 +0000)
commit1af973b26cff00663fe54dbf8e4d98234a4ceb5e
treecedcdc410c4f72dbeb8e39b89ff3ddc105302b42
parent8655be287d07e96e199502777f403bb38a766ba0
parent69fcacc296de831358d6b6f3cdc49ca76df1c61d
am 69fcacc2: (-s ours) am 7ddac827: (-s ours) am 052e50dd: (-s ours) Import translations. DO NOT MERGE

* commit '69fcacc296de831358d6b6f3cdc49ca76df1c61d':
  Import translations. DO NOT MERGE