| commit | d13c86f4823ebf85c06669dd272766afc357e714 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 19:01:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 19:01:24 2014 +0000 |
| tree | 24cee94ab622f8febd88367d94a2c7b39edf8bf6 | |
| parent | 41f31927c9ca4c4f9089d844e195bc717e7d9952 [diff] | |
| parent | 17d5266ea151f6292ee7720034f711d2152fa41d [diff] |
am 17d5266e: (-s ours) am 6e69aeb9: (-s ours) am d6a85f6e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '17d5266ea151f6292ee7720034f711d2152fa41d': Import translations. DO NOT MERGE