| commit | 3f693dbae1657c74427d7d64a85acdc032fd82b8 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Sep 24 18:08:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 24 18:08:44 2014 +0000 |
| tree | a63de342501a9ca2af5dec6b9bd3678e8bee8200 | |
| parent | fdf2e71e14f9442ce60bcf2bf3870f660b3426f2 [diff] | |
| parent | 84d9bbdcd47a8be781e54cde537594132678bb99 [diff] |
am 75ca2568: (-s ours) am 8427b62b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '75ca2568b8c4383a2e6e164849b4ec366838fd58': Import translations. DO NOT MERGE