commit | d085dda65a06abba474e4927722881d7ed0973a2 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:21:57 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:21:57 2014 +0000 |
tree | 482b0a8513b459ef8f19ac59e9aa9e5edf7ea2e1 | |
parent | 0b20abdeae76c77a71eeba2ba9bdec2d168e8bdb [diff] | |
parent | e5577ea278a533014b664ab1e5357eeabc3b7142 [diff] |
am 4b059bf7: (-s ours) am c5ad6b9e: (-s ours) am 9ab79fcb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '4b059bf76bca6f61385d8ffee308725230a5e020': Import translations. DO NOT MERGE