OSDN Git Service

am d9954e12: (-s ours) am 3191875f: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Fri, 4 May 2012 20:30:05 +0000 (13:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 May 2012 20:30:05 +0000 (13:30 -0700)
commit54427888ed3b2f1ef2fd202c18aa8c9fd2ff535a
tree15ae1762929f68f0181a1e0a45f002189cb66fd3
parent5eeb896fd725652fb1d93031b9878f33e904cd19
parentd9954e12a82d8fca4d08614657b7ee7509ba6294
am d9954e12: (-s ours) am 3191875f: Import translations. DO NOT MERGE

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