OSDN Git Service

am f90404ca: (-s ours) am ff26f10f: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Dec 2014 19:50:17 +0000 (19:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Dec 2014 19:50:17 +0000 (19:50 +0000)
commitf93c82ae366970b3c06dedf2b040d000c16d2261
tree9ea2a8332cfbd7a3342159ffdff2489101cd70c0
parent2cbfc8455d51cb89cdd161f5e46d1f56023c903b
parentf90404ca7b47234437b3f8f418fca313825de02c
am f90404ca: (-s ours) am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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