OSDN Git Service

am f36574be: am baa22861: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 17 Jun 2013 19:14:25 +0000 (12:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Jun 2013 19:14:25 +0000 (12:14 -0700)
commit8543578f108d703b7db8fbea3ab5e7f2e7c67483
treef33745891a4668aa8601ba76fb274cb0036ac027
parent0722071c5d180e42f304aaefdc8e1a4cc505bf42
parentf36574be8845a69b091684e6c2a904af909c713f
am f36574be: am baa22861: (-s ours) Import translations. DO NOT MERGE

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