| commit | 2bb933a5129cccb29e31fe2db00109bab6805979 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 14:20:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 14:20:20 2014 +0000 |
| tree | d45ad6d965b2368aaf3b248fb193b28dcdc5f583 | |
| parent | a362bacb16d31b48e6cb7a59b40252137c899862 [diff] | |
| parent | 862ecfa38a5df179bcacf7e5f0c8c2cfef994193 [diff] |
am 862ecfa3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '862ecfa38a5df179bcacf7e5f0c8c2cfef994193': Import translations. DO NOT MERGE