OSDN Git Service

am bf33451e: (-s ours) Merge "Build broken Revert "Import translations. DO NOT MERGE...
authorBaligh Uddin <baligh@google.com>
Sat, 5 Oct 2013 16:37:02 +0000 (09:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 5 Oct 2013 16:37:02 +0000 (09:37 -0700)
* commit 'bf33451ece2d872aa5dfc770a694a4f57432698b':
  Build broken Revert "Import translations. DO NOT MERGE"


Trivial merge