| commit | e552d003412958f09168f239ab802b9af29fcfe8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 23:00:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 23:00:25 2015 +0000 |
| tree | e1319641cfe21d318389fbf89d84c76c4ae9e61a | |
| parent | a06a903fa4f414bd5a1aa0c6061a5b46b7739013 [diff] | |
| parent | 57b4d24e779a10a6dccf4c5c841d1f43c2bc77fd [diff] |
am 57b4d24e: (-s ours) am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translations. DO NOT MERGE * commit '57b4d24e779a10a6dccf4c5c841d1f43c2bc77fd': Import translations. DO NOT MERGE