| commit | cbbbc64f6f6a277fe86a794da97051a773cb263a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 22 18:05:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 22 18:05:08 2015 +0000 |
| tree | 20db03caf89960458504d9e2d5b0938e99550084 | |
| parent | d35930d2088f55d4cc3d9897dc312a8a3e47aef2 [diff] | |
| parent | 0898c57839f107a81cc0cb9838a7f078062371ee [diff] |
am 0898c578: (-s ours) am 1b53e06f: (-s ours) am 210a6da6: (-s ours) Import translations. DO NOT MERGE * commit '0898c57839f107a81cc0cb9838a7f078062371ee': Import translations. DO NOT MERGE