| commit | 23e8e3f42832d3b0ea7316c23e772cf8e1ae076d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Mar 20 23:15:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:15:25 2015 +0000 |
| tree | 93bc72c4bfbc7da41d43bae78b4e593e192ea749 | |
| parent | 6c765128cfc3f248c5d72865964b1975a00d3390 [diff] | |
| parent | c0372e26170a1f9694a55e3eef988152c87c3797 [diff] |
am c0372e26: (-s ours) am 8b395673: (-s ours) am b1f96903: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'c0372e26170a1f9694a55e3eef988152c87c3797':