| commit | b29bd88923fca63223b666b691983bb2f25deab4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Dec 17 14:37:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 17 14:37:08 2014 +0000 |
| tree | b94980e67964795764371849b3f4e7acb9bf98d9 | |
| parent | 8a1d95d8262e4e4616b6fe7df0937a05f047919f [diff] | |
| parent | ad1d38e0a7cf2ace2b95dee1c55a4f2e29dd6d7c [diff] |
am ad1d38e0: (-s ours) am 4ee8ff7c: (-s ours) am d32a8618: (-s ours) Import translations. DO NOT MERGE * commit 'ad1d38e0a7cf2ace2b95dee1c55a4f2e29dd6d7c': Import translations. DO NOT MERGE