| commit | b23d6613ecaa0f613f30c8c597903ab9f2dfeef4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 14 17:50:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 17:50:35 2014 +0000 |
| tree | 8ce2cf26bc6fdf5e57e5972e38e456414f5a63c2 | |
| parent | daea0c4cbbf75b11a9c93ac1c3b05530a5932f79 [diff] | |
| parent | 48caf4b3bf304513cd094115924a8a49e39c72b0 [diff] |
am f4511cd4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'f4511cd4b951f5c2f517b79affb4469edafafcd7': Import translations. DO NOT MERGE