| commit | 9cfd396ec5e4e52d97337e25cd51660ace7f3744 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:09:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:09:46 2015 +0000 |
| tree | 2d4ff6c5c3e23fb7dae3a5f658f12551c0ac1b87 | |
| parent | d7f602577ee1c47d2c7eb280977039eb03cce0e4 [diff] | |
| parent | 2c3102fd170eee806ae37207a49ef7a019ecd090 [diff] |
am 2c3102fd: (-s ours) am 76c3a31e: (-s ours) Import translations. DO NOT MERGE * commit '2c3102fd170eee806ae37207a49ef7a019ecd090': Import translations. DO NOT MERGE