OSDN Git Service

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


Trivial merge