OSDN Git Service

am b38d00d5: (-s ours) am abd2a4a4: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 23 Apr 2014 02:15:31 +0000 (02:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Apr 2014 02:15:31 +0000 (02:15 +0000)
commit3e1668fd04827da04eaa7ff45df1edf658a895e1
treed118ec8c8a64722569d0e7d1043817b0b0202628
parent6e1ac37150d840573fd8aec60ae1ea18ea91e075
parentb38d00d5793bcb176683f89f70ae36768373fe49
am b38d00d5: (-s ours) am abd2a4a4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

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