| commit | 828b36d0cec66f87aae75411373ce009d2ed7903 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jul 28 23:56:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 28 23:56:33 2015 +0000 |
| tree | 7f7537a8a14b7e5a6bb6f910234d2dd5e6e0a8c1 | |
| parent | d49d43c2843abc90b3f91d4288664594ad89f83a [diff] | |
| parent | 5edb1cb046b0769707512e9efbd2bcaed8d24fc8 [diff] |
am 5edb1cb0: (-s ours) am 86ab81d5: (-s ours) am a629d7d2: (-s ours) am 9fd976e4: (-s ours) Import translations. DO NOT MERGE * commit '5edb1cb046b0769707512e9efbd2bcaed8d24fc8': Import translations. DO NOT MERGE