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