OSDN Git Service

am 0cf4329d: (-s ours) am 6bb8844a: (-s ours) am fa1df427: (-s ours) am b8fe3aa2...
authorGeoff Mendal <mendal@google.com>
Mon, 2 Dec 2013 23:30:59 +0000 (23:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 Dec 2013 23:30:59 +0000 (23:30 +0000)
commitda59631e934193a1d9811bc148ffeda00b5120c4
tree36dff3cc6ba2797ef6e0436fc5ecfbdd5f33942f
parentddc4bf8dd1c19c0ef6c915bd65448ec27ee0c845
parent0cf4329dbedbae2a3511d2456ddf50de9c039033
am 0cf4329d: (-s ours) am 6bb8844a: (-s ours) am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE

* commit '0cf4329dbedbae2a3511d2456ddf50de9c039033':
  Import translations. DO NOT MERGE