OSDN Git Service

am 6137316b: (-s ours) am bf33451e: (-s ours) Merge "Build broken Revert "Import...
authorBaligh Uddin <baligh@google.com>
Wed, 30 Apr 2014 18:14:41 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:41 +0000 (18:14 +0000)
commit9cee7aafd10988328ba46df19fe39b87e07e1893
tree3804e07840427a842ef1bdc750bffe2239123c26
parent14542a7bc24458f430dbbf7a41b3afb8459a6984
parent6137316bb6e5b727a63ff4505828d3334aa8d4b7
am 6137316b: (-s ours) am bf33451e: (-s ours) Merge "Build broken Revert "Import translations. DO NOT MERGE"" into klp-ub-dev

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