| commit | fd169d1ef698992444b785617a1da1df40059bd6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 19:03:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 19:03:30 2014 +0000 |
| tree | 1896fb35993cc028e811e754083a033726fab1c3 | |
| parent | 17d5266ea151f6292ee7720034f711d2152fa41d [diff] | |
| parent | 3c68bde1ce64e1d6089f9e4fb89cec402f7f57ca [diff] |
am 3c68bde1: (-s ours) am ce9003f7: (-s ours) am 1b77f365: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '3c68bde1ce64e1d6089f9e4fb89cec402f7f57ca': Import translations. DO NOT MERGE