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