OSDN Git Service

am 7ef6f5be: (-s ours) am 47becad6: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)
commit436fc7a9506df08e5c7f667bc88e2f66692ce6e9
tree3804e07840427a842ef1bdc750bffe2239123c26
parent73fdf89dc5057387bb43d4af7a099e5d09b88391
parent7ef6f5be7aa363b5200b9e4ec9405a8752e31ee7
am 7ef6f5be: (-s ours) am 47becad6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '7ef6f5be7aa363b5200b9e4ec9405a8752e31ee7':
  Import translations. DO NOT MERGE