OSDN Git Service

am 814b0b73: (-s ours) am 2a22627e: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 13 Nov 2013 21:11:53 +0000 (13:11 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 Nov 2013 21:11:53 +0000 (13:11 -0800)
commit2218d330ad4bda30311d8552cc2140484d636678
tree80f2e08a1bed79982af02a1fd13a3dd176cccc22
parentd0e2b18f55723ec2b045a28ad16b8edc07d27ad8
parent814b0b734772bfdbaa6b1888a253afc00c78bb58
am 814b0b73: (-s ours) am 2a22627e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '814b0b734772bfdbaa6b1888a253afc00c78bb58':
  Import translations. DO NOT MERGE