OSDN Git Service

am 04fc60c4: (-s ours) am 8e2fb4c9: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Wed, 22 Oct 2014 23:58:50 +0000 (23:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 Oct 2014 23:58:50 +0000 (23:58 +0000)
commitc07b54afa615d23f88960161048b308d0829bacb
tree7e842f4aa4faeb227532de2eb0bac4a72c089c3f
parent49c5efde90d75f07f13f01493a77495701545969
parent04fc60c4d37617eaad6c2b8bb6002c4679bb0f0a
am 04fc60c4: (-s ours) am 8e2fb4c9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '04fc60c4d37617eaad6c2b8bb6002c4679bb0f0a':
  Import translations. DO NOT MERGE