| commit | e864ebe1f970b4711ec1274430e306e71146b3d7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 07 13:07:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 07 13:07:39 2015 +0000 |
| tree | de0e85fe07b1afb57f2c2ad2bd3ba55f677c1968 | |
| parent | 4472dc4b6a45e1fef2ef4c6520fb3b0855151c6e [diff] | |
| parent | 8527762af63566c75d955a8d8bb1f8c3ead442af [diff] |
am 8527762a: (-s ours) am c5f66d7e: (-s ours) am 5e183ac6: (-s ours) am bd64cd59: (-s ours) am 35d2cf1c: (-s ours) am b4a027d0: (-s ours) Import translations. DO NOT MERGE * commit '8527762af63566c75d955a8d8bb1f8c3ead442af': Import translations. DO NOT MERGE