commit | 043af5575e549bfdc6d3f5ce3c29d9ce9fb62ea5 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:00:31 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:00:31 2015 +0000 |
tree | f51bfa4fe52218248dc4f03eab6188b76a183b45 | |
parent | 6f09e99d24b4f67ef14d78a18a246da67cca650e [diff] | |
parent | f4d53d6fdad4335e817c6f71e730b0cf0165de0a [diff] |
am f4d53d6f: (-s ours) am 31d085ff: (-s ours) Import translations. DO NOT MERGE * commit 'f4d53d6fdad4335e817c6f71e730b0cf0165de0a':