| commit | 7ee164ce8d62d83addc13de6abc6240bfc28fdd3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 03 12:50:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 03 12:50:07 2015 +0000 |
| tree | 0c85c8260f049b5ee00c740969067e54bd8b0a89 | |
| parent | d6a3f92e86298fa7b2c0d84ee0318446fb766f39 [diff] | |
| parent | 0e416a72938227650d7bc4e190c17d6ac6958f90 [diff] |
am 0e416a72: (-s ours) am a9bb55e5: (-s ours) Import translations. DO NOT MERGE * commit '0e416a72938227650d7bc4e190c17d6ac6958f90': Import translations. DO NOT MERGE