| commit | aa845fabd450bf04fd385e7e31bcc72cf7b460f4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:17:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:17:16 2015 +0000 |
| tree | 191514d54b653ff6eab869169dfbb278a5082665 | |
| parent | 7e0fa9cff7ef64552443453eff7c4a0d3d7c36d1 [diff] | |
| parent | bb269a0e0e132beb00092515ffaa240bf9168e71 [diff] |
am bb269a0e: (-s ours) am 2cf3069b: (-s ours) am cb469c24: (-s ours) am 3225addc: (-s ours) am 9e5af63c: (-s ours) Import translations. DO NOT MERGE * commit 'bb269a0e0e132beb00092515ffaa240bf9168e71': Import translations. DO NOT MERGE