| commit | 9c3145cf6b4aad1d9deaf95d0dc75829bab7ce99 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jun 16 21:28:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 16 21:28:41 2015 +0000 |
| tree | a0d3a5f552c2ed255cb1dfaa2f38c175b1422ddc | |
| parent | 25cfa1203d7a5de7db89dd2b693725bedd47dc67 [diff] | |
| parent | 1171e6a3b196c5304f2221fb22b23d097294b6dc [diff] |
am 1171e6a3: (-s ours) am 9753a3ae: (-s ours) Import translations. DO NOT MERGE * commit '1171e6a3b196c5304f2221fb22b23d097294b6dc': Import translations. DO NOT MERGE