| commit | 461fe20331dcb8437f284429d3d53cea8159bc6e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 21:16:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 21:16:18 2014 +0000 |
| tree | e5369026136f79657e70661751fe1bf7f962af28 | |
| parent | c0bbff5bd341ab5e4ef45083ae4a4a25ea1d7063 [diff] | |
| parent | 74b50520827e960cfbcd79d4523757599cbb3974 [diff] |
am 69911348: (-s ours) am 4ce0199e: (-s ours) am 8bf6bc2a: (-s ours) Import translations. DO NOT MERGE * commit '699113482254ab6f7a9a4805c7d74767fe1c8c2d': Import translations. DO NOT MERGE