| commit | ca3bc1db316bcb645ffc331fc2998739a8349801 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Aug 19 12:47:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 19 12:47:18 2015 +0000 |
| tree | 95f0822ba83e68204ef27a3bb312561a7214df5b | |
| parent | bbed30932260f602e0181d553e7fdc10c7a29a26 [diff] | |
| parent | 5314e71eb2f22e16ec3b2e9cfbeba8a4ecb2fa2b [diff] |
am 5314e71e: (-s ours) am 2e65dd91: (-s ours) am f5c3a700: (-s ours) Import translations. DO NOT MERGE * commit '5314e71eb2f22e16ec3b2e9cfbeba8a4ecb2fa2b': Import translations. DO NOT MERGE