| commit | 9735cbd1e37398ed24267bdb43570f28b810572e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 18:45:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 18:45:22 2014 +0000 |
| tree | 3cdbf3b2b877a494ef6136b3cfef146419363f1c | |
| parent | 9c3c4a48769284fb8379542d03f05881fc27af4f [diff] | |
| parent | 29be6698f05d0e9b8e7a48bc4e639bde3ca8e171 [diff] |
am 29be6698: (-s ours) Import translations. DO NOT MERGE * commit '29be6698f05d0e9b8e7a48bc4e639bde3ca8e171': Import translations. DO NOT MERGE