| commit | 3c68bde1ce64e1d6089f9e4fb89cec402f7f57ca | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 18:57:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 18:57:07 2014 +0000 |
| tree | f7e4affe4b23e49dba29712777c563a15ca20058 | |
| parent | 6e69aeb9b2eb9cbe8fb1006cd2f598f7acd6b6d5 [diff] | |
| parent | ce9003f7c24f44d8e1d1fee65dca444e6a61d061 [diff] |
am ce9003f7: (-s ours) am 1b77f365: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'ce9003f7c24f44d8e1d1fee65dca444e6a61d061': Import translations. DO NOT MERGE