| commit | 6adbd880fcbdd7de70b7e21b0c6a64e8dd3e988b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 21:17:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 21:17:47 2014 +0000 |
| tree | 34bf7b0d05be2652a4673f445fac0b94381db39b | |
| parent | 645781c8e2cb63609e52174990980badb51ead5e [diff] | |
| parent | c0bbff5bd341ab5e4ef45083ae4a4a25ea1d7063 [diff] |
am ad423a4a: (-s ours) am a4ef0282: (-s ours) am 94946bbb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'ad423a4a8ce400442102f188e9def9ac75ffffc1': Import translations. DO NOT MERGE