| commit | fe74cdcc60fd2d3151e3ded9dbaf52cc14a2d918 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Mar 25 19:09:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 19:09:16 2014 +0000 |
| tree | 654cf7a5e2bdd359020114a653c26657b85f1e7c | |
| parent | 1df9bc5c1d47a09b08d49287d81832e18674bece [diff] | |
| parent | 0a4bd7c90c836a8d3d857753c72d83b35cefa5f3 [diff] |
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