| commit | d53a08fa9727b47672ea16d8c9a6566046ce456e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 19 15:37:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 19 15:37:08 2014 +0000 |
| tree | 531a7c7775d8c4d23fd8954d3f137d7aa3bceb3f | |
| parent | f02c00bf674c4c295745af099095f07dbc579de3 [diff] | |
| parent | 2e6b3a76dfccc5407e7d37fa2a98099c57170601 [diff] |
am 2e6b3a76: (-s ours) am 91370ba9: (-s ours) Import translations. DO NOT MERGE * commit '2e6b3a76dfccc5407e7d37fa2a98099c57170601': Import translations. DO NOT MERGE