OSDN Git Service

am a5af1375: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:35:07 +0000 (11:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:35:07 +0000 (11:35 +0000)
commitad6eb955e4f7f2cc7950e8f8cc0446fa6fc1060e
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parentac23c640b53d6353504946e76b9a004c456e0b5c
parenta5af13758a371e9e162d56b34b07a836f473347f
am a5af1375: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE

* commit 'a5af13758a371e9e162d56b34b07a836f473347f':