| commit | 17d5266ea151f6292ee7720034f711d2152fa41d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 18:55:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 18:55:26 2014 +0000 |
| tree | 1896fb35993cc028e811e754083a033726fab1c3 | |
| parent | 9c02cc81ef5c870f53bf663e0a695255d12c0de0 [diff] | |
| parent | 6e69aeb9b2eb9cbe8fb1006cd2f598f7acd6b6d5 [diff] |
am 6e69aeb9: (-s ours) am d6a85f6e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '6e69aeb9b2eb9cbe8fb1006cd2f598f7acd6b6d5': Import translations. DO NOT MERGE