OSDN Git Service

am 6e5ae500: (-s ours) am b5cdb04a: (-s ours) am 8bab49cd: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:39 +0000 (18:14 +0000)
commit3d57513f9bdb805dd5a3a9ec7d39dda308755572
tree3804e07840427a842ef1bdc750bffe2239123c26
parentefd3f6fba408f2d6b055d61a4e700b2d98518ae9
parent6e5ae5008b647d996be7688db9a974ea00dd0be9
am 6e5ae500: (-s ours) am b5cdb04a: (-s ours) am 8bab49cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '6e5ae5008b647d996be7688db9a974ea00dd0be9':