| commit | c0cfb3f17f9983672410dc2fb2c32000a95e3aa1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 01 20:00:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 01 20:00:18 2014 +0000 |
| tree | 8be5c78fea5408caf8dc5e14f32e8de50ff6a686 | |
| parent | 4d800712fede926f93f811b195c7935e0680e9ec [diff] | |
| parent | 6c3620a4a9dfbb6be2476d542c3398868c7b2505 [diff] |
am 6c3620a4: (-s ours) am 2a7f5a41: (-s ours) am 0a39f81c: (-s ours) Import translations. DO NOT MERGE * commit '6c3620a4a9dfbb6be2476d542c3398868c7b2505': Import translations. DO NOT MERGE