| commit | 7d9381ace1b230b57191bebed47df9da94563cfc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jul 28 23:11:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 28 23:11:52 2015 +0000 |
| tree | 7f7537a8a14b7e5a6bb6f910234d2dd5e6e0a8c1 | |
| parent | 52572f4ee759502d3351b5d90c993844ef2b32d6 [diff] | |
| parent | e090d8318ddff9f2fd7bb447c9be8e130fae0abf [diff] |
am e090d831: (-s ours) am 84d6b6d2: (-s ours) Import translations. DO NOT MERGE * commit 'e090d8318ddff9f2fd7bb447c9be8e130fae0abf': Import translations. DO NOT MERGE