commit | 155e90e8f6d53218a132f641583ad3a1c4ea9769 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 13 18:51:44 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 18:51:44 2014 +0000 |
tree | ac1420553126c7167abcc6673ec0d68499e881fa | |
parent | 819e36d944b7df8f3634eb19150beb446a4ea4e8 [diff] | |
parent | c8d5b243f109897537150b7f240a658ee8fdf7fe [diff] |
am c8d5b243: (-s ours) am 9c3c4a48: (-s ours) Import translations. DO NOT MERGE * commit 'c8d5b243f109897537150b7f240a658ee8fdf7fe': Import translations. DO NOT MERGE