commit | 26e89553489b962ad587c80ca326829a596b6ea6 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Oct 05 18:04:53 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 05 18:04:53 2014 +0000 |
tree | a35a5cb57ebcb4a6e7bbbfe3f21d813e6be70f4a | |
parent | 0da4783cb72ed1e3cbf4fe0e1c9abf66a07b9b4b [diff] | |
parent | e823992f94d69936c926f5c00a85a4d3dbfe0a93 [diff] |
am e823992f: (-s ours) am 9e32249d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'e823992f94d69936c926f5c00a85a4d3dbfe0a93': Import translations. DO NOT MERGE