OSDN Git Service

am a5a921e3: (-s ours) am 4545b1d2: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Fri, 14 Mar 2014 16:27:44 +0000 (16:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 16:27:44 +0000 (16:27 +0000)
commit46bfaa1b93068c78ea5a2ab337ea8b98592b7c10
treefb3ba5c71a3b2d69ee6307a50db79873500a4bf5
parentd4981014d486c3ff72813d0d37048ee2abdb3d63
parenta5a921e3a80eddd4622dd4d2d1c91d5ee71583f5
am a5a921e3: (-s ours) am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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