| commit | 593a663f405bbb80931be1ebc95fb3250cb27151 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Aug 22 18:40:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 22 18:40:46 2014 +0000 |
| tree | 4cef82b77e5cb47cc4d8fa3cf0782c6df18a42ff | |
| parent | dffa10eaa4ee752b533f7215426a4aba841e3ebd [diff] | |
| parent | 9821a0ab9fb4fc6ae1a38e643d93c9ef7b961981 [diff] |
am 9821a0ab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '9821a0ab9fb4fc6ae1a38e643d93c9ef7b961981': Import translations. DO NOT MERGE