OSDN Git Service

am 631fd465: (-s ours) am ab93f0e8: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 24 Jun 2015 15:56:28 +0000 (15:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Jun 2015 15:56:28 +0000 (15:56 +0000)
commita8ac70647b5e8a77cebade3b42a60ba942a21065
treee0557db0c63e2b72beac52936dfc9db6937d4ab0
parent396366eda979351f9749d3c86036c8f5cd71a62c
parent631fd465cc6fbb146ed2469ef1821e81e8c1b7de
am 631fd465: (-s ours) am ab93f0e8: (-s ours) Import translations. DO NOT MERGE

* commit '631fd465cc6fbb146ed2469ef1821e81e8c1b7de':
  Import translations. DO NOT MERGE