OSDN Git Service

am 0a4bd7c9: (-s ours) am f3183062: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Tue, 25 Mar 2014 19:09:16 +0000 (19:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 19:09:16 +0000 (19:09 +0000)
commitfe74cdcc60fd2d3151e3ded9dbaf52cc14a2d918
tree654cf7a5e2bdd359020114a653c26657b85f1e7c
parent1df9bc5c1d47a09b08d49287d81832e18674bece
parent0a4bd7c90c836a8d3d857753c72d83b35cefa5f3
am 0a4bd7c9: (-s ours) am f3183062: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '0a4bd7c90c836a8d3d857753c72d83b35cefa5f3':
  Import translations. DO NOT MERGE