| commit | a7d7437c12ae0bfd264712dd1db9290d480630f4 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Nov 07 16:02:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 16:02:40 2014 +0000 |
| tree | 1fda4e581cd581bbd556c27f3d874e4406aa56c2 | |
| parent | 59bde8429b1faa24e60957eca3db07214d43c1ea [diff] | |
| parent | f3a1007af01d49db4af2d8152b781c55ee2f7bca [diff] |
am f3a1007a: (-s ours) am 6aaa61fd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'f3a1007af01d49db4af2d8152b781c55ee2f7bca': Import translations. DO NOT MERGE