commit | 873c49bfb4c09cce46ea27c51548d30733605ad0 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:28:15 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:28:15 2014 +0000 |
tree | 5de1546b41917a415dfec6bce546912b6fa00ff2 | |
parent | ee183eab0758302cc056754bf2704bc9b579e1de [diff] | |
parent | 5f4b2090501b05492b996dbefc7f2317f4c37b63 [diff] |
am 770ba1cb: (-s ours) am f35f652a: (-s ours) am 1805b1a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '770ba1cb56b06b2d98dd83d16d1cc70c68588b84': Import translations. DO NOT MERGE