| commit | d3cfe5a78a0318544136dd8587c32c1bdbe26ab0 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 19 07:19:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 07:19:52 2014 +0000 |
| tree | 3adaee92a711e15e92093b3b6d9e5de3aa258de8 | |
| parent | cb93f96f15e982b400a0f6c1c05c63bc97b59b52 [diff] | |
| parent | bef441a0ae5f6932be945ef3b87862ec84af3cf6 [diff] |
am bef441a0: (-s ours) am eed907c2: (-s ours) am 57e25899: (-s ours) am 6cd29c10: (-s ours) am b979cd54: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'bef441a0ae5f6932be945ef3b87862ec84af3cf6':