commit | 99842468d307709cc90414339aa7ddab2f08c855 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Sep 30 12:33:46 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 30 12:33:46 2015 +0000 |
tree | 9af3ecceea138a4adc38a7ba030d3824ce16cb28 | |
parent | 85951318b7e2b639ac3e2c9b8fc18486038920ff [diff] | |
parent | afc3831267c426974119608bb6c9179223532e47 [diff] |
am afc38312: (-s ours) am 77fc6ac5: (-s ours) Import translations. DO NOT MERGE * commit 'afc3831267c426974119608bb6c9179223532e47': Import translations. DO NOT MERGE