commit | 4eec42f7575fcb63cb0af7d898ba0525ec8e248f | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Sep 11 15:41:48 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 11 15:41:48 2014 +0000 |
tree | 1db4ff68a073d0c7b087a618651610f91a1b2c20 | |
parent | 03dc5385cd28009b4fdf894f7823dab103b1b98e [diff] | |
parent | f8257a0e576f8ddee06805951e5ac34c0765dca4 [diff] |
am f8257a0e: (-s ours) am f1bc3d1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'f8257a0e576f8ddee06805951e5ac34c0765dca4': Import translations. DO NOT MERGE