| commit | 698a2f251a483c60ae27117d31cb0b5b528fddce | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:23:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:23:52 2014 +0000 |
| tree | 273508becb882c6bb1bd192b61d60897f4d7595b | |
| parent | daee2ece8ba16e1736da85726c7687190ec09318 [diff] | |
| parent | ab7cf487560983f0ebaddb60d03ba58967925a57 [diff] |
am ab7cf487: (-s ours) am 794ce1e8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'ab7cf487560983f0ebaddb60d03ba58967925a57': Import translations. DO NOT MERGE