| commit | 20083734d92eb893c36278d2486404eedc0cc1f9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 10 17:31:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 10 17:31:24 2014 +0000 |
| tree | 5bf464ae88800985e1235a45247e5512a02ffd77 | |
| parent | 78a853d17a33958ebc7d014cc6ec3998696302d3 [diff] | |
| parent | 8f02ec4fce4a77c78eff04b709831e0f4ec7cb43 [diff] |
am 8f02ec4f: (-s ours) am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '8f02ec4fce4a77c78eff04b709831e0f4ec7cb43': Import translations. DO NOT MERGE