OSDN Git Service

am a60df014: (-s ours) am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Thu, 13 Mar 2014 18:02:47 +0000 (18:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 18:02:47 +0000 (18:02 +0000)
* commit 'a60df014e27d9cd57396655b98922394ff7d73bb':
  Import translations. DO NOT MERGE


Trivial merge