| commit | f5d0d89f186d8a0411e38c227ea369f25f428bc9 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 16 00:01:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 00:01:19 2014 +0000 |
| tree | 611310b3ee31117b436f4a606ac5a9c858e62370 | |
| parent | 72b774e2d38403cf4c29a7bcb25005c415e29a38 [diff] | |
| parent | c285fd7bbb3c27d7dc7c38acb61507dc268bbe97 [diff] |
am c285fd7b: (-s ours) am a033e8fd: (-s ours) am 9f78f924: (-s ours) am 64dd48e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'c285fd7bbb3c27d7dc7c38acb61507dc268bbe97':