| commit | 9ba3448fad9d359fac4a9d36f6df160c13c9952d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 12:21:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:21:09 2015 +0000 |
| tree | 22a8c4fafef7f8b49e5f05a44b9a44ec88f01449 | |
| parent | 8349d95b38a91f9f929667ccc7e39ee6316bcd83 [diff] | |
| parent | b99732b95e83c941e57a835b2465057ce55e9685 [diff] |
am b99732b9: (-s ours) am f9beee19: (-s ours) Import translations. DO NOT MERGE * commit 'b99732b95e83c941e57a835b2465057ce55e9685':