| commit | d52aa500412c248946bb8fa3cc4f3f20f5c34e3b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 29 14:29:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 14:29:27 2015 +0000 |
| tree | a2f1b476ca9393b5a583e65f9878893c41e6cb0c | |
| parent | 4aac30faf253047fb68358ae6acb7a76e7023c81 [diff] | |
| parent | 5111d83b8bb9344906f29502f9484832a042fd80 [diff] |
am 5111d83b: (-s ours) am f5016cd7: (-s ours) Import translations. DO NOT MERGE * commit '5111d83b8bb9344906f29502f9484832a042fd80': Import translations. DO NOT MERGE