commit | e76413b0f7cf04ffd0ca22b38c2e1661cfa9cbd8 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Sep 30 14:52:52 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 30 14:52:52 2014 +0000 |
tree | eaa113bd4bb5f52de29ff0349a1d371170af57ab | |
parent | 0c2afed48437dde656b361af0fb5835365fe23c8 [diff] | |
parent | e037c0b1ad9bb82fd069bd09fe9582864d922466 [diff] |
am e037c0b1: (-s ours) am 49b3a054: (-s ours) am c570fff1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'e037c0b1ad9bb82fd069bd09fe9582864d922466': Import translations. DO NOT MERGE