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)
commit6137316bb6e5b727a63ff4505828d3334aa8d4b7
tree0af02e2c50b1d11a43c0223d7548504bcf52acb7
parent2c5ad7cc54e89cbb29f43ea503e371c7d66195d8
parentbf33451ece2d872aa5dfc770a694a4f57432698b
am bf33451e: (-s ours) Merge "Build broken Revert "Import translations. DO NOT MERGE"" into klp-ub-dev

* commit 'bf33451ece2d872aa5dfc770a694a4f57432698b':
  Build broken Revert "Import translations. DO NOT MERGE"