OSDN Git Service

am fef07e22: (-s ours) am f5d6fc67: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Mon, 11 Nov 2013 17:11:18 +0000 (09:11 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Nov 2013 17:11:18 +0000 (09:11 -0800)
commitc54d55f60cf80e82353a407fe61fb9b13238fb24
tree419505831d461f2b257c9ca059a33c7ae87ec671
parent35965b92472f0751e3c1a3b9737b4daff05c3efd
parentfef07e226b01e4720e0a1f99f41520e29c10c7f7
am fef07e22: (-s ours) am f5d6fc67: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'fef07e226b01e4720e0a1f99f41520e29c10c7f7':
  Import translations. DO NOT MERGE