| commit | c08b5e566aa18de998b7db7ae4bbaae5b12b9ebb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Feb 16 17:16:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 16 17:16:52 2015 +0000 |
| tree | 4077bf3e6269d5d99a03a94d6d9a6d898f42e873 | |
| parent | a83708c211673f0f5b218a8f994aa82bc937d5cb [diff] | |
| parent | 0bbacbdd2f3d7711fb9bbcb2852ff62fd497d731 [diff] |
am 0bbacbdd: (-s ours) am 0a786f5f: (-s ours) am f27b9850: (-s ours) Import translations. DO NOT MERGE * commit '0bbacbdd2f3d7711fb9bbcb2852ff62fd497d731':