| commit | c26c57685760be9cbde1a6fdb81dfa65099a73bf | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 18:53:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 18:53:17 2014 +0000 |
| tree | 6ccf3dc6ca707b3566534ad0acc0767f38051dec | |
| parent | e5dbb4fb21ade1e4f64104071884046b428c78a9 [diff] | |
| parent | 819e36d944b7df8f3634eb19150beb446a4ea4e8 [diff] |
am 819e36d9: (-s ours) am f4dad830: (-s ours) Import translations. DO NOT MERGE * commit '819e36d944b7df8f3634eb19150beb446a4ea4e8': Import translations. DO NOT MERGE