commit | 62827c260fecde800a88808485258ade386db9b4 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 06 17:38:07 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 17:38:07 2014 +0000 |
tree | b7489e833831cb1e58197fbf18898ae4d9d92db9 | |
parent | 766772a95848aa79e80aa9f7f98b8ed9121d581d [diff] | |
parent | 7b95879b08a5ff885b1dc73101b7552ccaef970e [diff] |
am 25718e03: (-s ours) am 280d8b3f: (-s ours) Import translations. DO NOT MERGE * commit '25718e03fce7285425b323fa877edfaf326f6356': Import translations. DO NOT MERGE