OSDN Git Service

am 480f83cf: (-s ours) am db79e4d4: (-s ours) am 84f5bf82: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Mon, 14 Oct 2013 17:49:20 +0000 (10:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Oct 2013 17:49:20 +0000 (10:49 -0700)
commite394609a1a02bc637a14ce01b0deca19ef0029c5
tree4d76abe40d0f4aff57de0f1b906ec24d7b14281e
parentfd79664ca9935ba3ef59f0cab1fe012459b7dd32
parent480f83cfc661e437c77e6faa67a754ae22cee1d6
am 480f83cf: (-s ours) am db79e4d4: (-s ours) am 84f5bf82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '480f83cfc661e437c77e6faa67a754ae22cee1d6':
  Import translations. DO NOT MERGE