OSDN Git Service

am 5c00ae40: (-s ours) am f72f347c: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 30 Apr 2014 18:14:31 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:31 +0000 (18:14 +0000)
commit18156a558a6832682d81967ec40e15f828d3a973
tree3804e07840427a842ef1bdc750bffe2239123c26
parenta5b3b8538c8a18b41cc3686130058e8f9085ccc4
parent5c00ae404603943a5756e855e49f5e4d3d9271d8
am 5c00ae40: (-s ours) am f72f347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '5c00ae404603943a5756e855e49f5e4d3d9271d8':