| commit | 4852ba6c43cea3946215ce7de9c6b6eca353fcf4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 13:53:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 13:53:27 2015 +0000 |
| tree | 4e9145baf1e622b5f8105235f1fe2f7b068cb185 | |
| parent | 6e423b5389aedb368c6f6b1a484ff69673303de9 [diff] | |
| parent | db369d427605ed0fb058c7b7e8e3dbe9cc93d688 [diff] |
am 06a55052: (-s ours) am 2e4c19af: (-s ours) am c15629dd: (-s ours) am b2d17e76: (-s ours) Import translations. DO NOT MERGE * commit '06a55052616bf706c55122f4348ccf3fb7f37e14': Import translations. DO NOT MERGE