| commit | 9ecba4e7d5406607429a56090ab8deb1d3bb731d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 17 20:27:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 20:27:46 2014 +0000 |
| tree | d63e14647b97b2ed0469dd79450d5cb22586428b | |
| parent | 44249871d0e4a3a8bc1e85f513120fece7e3d30e [diff] | |
| parent | e477510104f7a31650974b827bab3ebdaf7b5427 [diff] |
am e4775101: (-s ours) am e8e6b933: (-s ours) am c81a3e16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'e477510104f7a31650974b827bab3ebdaf7b5427': Import translations. DO NOT MERGE