OSDN Git Service

am 940f2a74: (-s ours) am 67a50f99: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Thu, 2 Feb 2012 21:49:08 +0000 (13:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Feb 2012 21:49:08 +0000 (13:49 -0800)
commit201a77ea399527da0f69faf14cc26162909f43c7
tree40cbb220f320cdba115e96b714e33f779dec0b19
parentc61223ce85bc0010130c4fcbc6b3a4aa0543192b
parent940f2a7479eb68af290f631d227bc79dcf29a7c5
am 940f2a74: (-s ours) am 67a50f99: Import translations. DO NOT MERGE

* commit '940f2a7479eb68af290f631d227bc79dcf29a7c5':
  Import translations. DO NOT MERGE