| commit | 7e6f985e9948c18269b11862864e0b9ab26e83ee | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:16:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:16:20 2014 +0000 |
| tree | 2e656dadd7dbd6589ef7a89f586e836a77a07094 | |
| parent | a653eae43828f7d09d20ece528a3d97eaed70d73 [diff] | |
| parent | 6f6098e2b19e387178132e3acd07a25f173eb793 [diff] |
am 6f6098e2: (-s ours) am d1247fa9: (-s ours) Import translations. DO NOT MERGE * commit '6f6098e2b19e387178132e3acd07a25f173eb793': Import translations. DO NOT MERGE