commit | be2b6c3e88a16a6b1a46b64bd480f70be3de9730 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Jul 20 18:07:26 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 20 18:07:26 2014 +0000 |
tree | bb3b828c0cac1d442a45d167a67b59772446c701 | |
parent | d8429c9efd9ade84c4aa0f38b64d51e36c626cf0 [diff] | |
parent | ef964985265efe781365fe5a3872787ac823a031 [diff] |
am ef964985: (-s ours) am 529b37ea: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'ef964985265efe781365fe5a3872787ac823a031': Import translations. DO NOT MERGE