| commit | 2315ee5903891bc07dd5a611e0d2ebb79b306b2f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 02 14:26:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 02 14:26:10 2015 +0000 |
| tree | 71db90e4337f807ac836a3d7948b2d5856db4bf4 | |
| parent | 32e40e70497fdf7e1c7f3b3cb871db8c59bff0c9 [diff] | |
| parent | bd74dff8b451a7099beb6cacc54f1062d58b5054 [diff] |
am bd74dff8: (-s ours) am a377ea1c: (-s ours) am 130fc5ca: (-s ours) Import translations. DO NOT MERGE * commit 'bd74dff8b451a7099beb6cacc54f1062d58b5054': Import translations. DO NOT MERGE