| commit | 8b480ca2b477dbffacce41a4e42f565a0645da02 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 21:05:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 21:05:12 2014 +0000 |
| tree | bd35988e501803ae0a7d0448034a9172f8b1d393 | |
| parent | 30208e113fcc589edd57b5e8f232bc8d4850fff8 [diff] | |
| parent | b6b6b132b7e86bbfcf671bbfb375acaca1863fda [diff] |
am 94946bbb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '94946bbb314642e60b8bb3d2fde6855a32c8e07a': Import translations. DO NOT MERGE