OSDN Git Service

am e096cec4: (-s ours) am bcdea4ae: (-s ours) am 16376616: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)
commit0fd1e62de68dba540ee2c1454c81fe04c86f1653
tree3804e07840427a842ef1bdc750bffe2239123c26
parent4917ee5f5940c4f67cd9bd6f854c1ce8de976317
parente096cec4964acb5e82cd63df90d7c56c29008ac4
am e096cec4: (-s ours) am bcdea4ae: (-s ours) am 16376616: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'e096cec4964acb5e82cd63df90d7c56c29008ac4':