| commit | 6bd8103b5925a09872153a935982f896dba457ad | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Sep 17 05:09:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 17 05:09:12 2014 +0000 |
| tree | 611310b3ee31117b436f4a606ac5a9c858e62370 | |
| parent | f3715e4548f8a4f4e461bb24e131757d47f5c101 [diff] | |
| parent | 9b0ae11dc87d93a523ac6c18f8c0aed38bddd102 [diff] |
am 9b0ae11d: (-s ours) am 8262c348: (-s ours) am f89add8d: (-s ours) am d5937725: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '9b0ae11dc87d93a523ac6c18f8c0aed38bddd102': Import translations. DO NOT MERGE