OSDN Git Service

am a5569d48: (-s ours) am b2bd24f1: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Tue, 7 Oct 2014 00:20:58 +0000 (00:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Oct 2014 00:20:58 +0000 (00:20 +0000)
commit25281aecbd9846bd6b887db0c88e46e24ddb57e0
tree97784768c758604b0a4e5d55fbfcbb9e72f22f73
parent87a092d965a878f2062ca2a07afa613b54a8b573
parenta5569d48dd342821a252dcb85b7756d55e2af3c7
am a5569d48: (-s ours) am b2bd24f1: (-s ours) Import translations. DO NOT MERGE

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