| commit | 949feef406075e4e1e1ce83836831e43049f026d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:23:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:23:51 2015 +0000 |
| tree | 05121f2cf4de9162fb4184ebe1989f4d3c05ca35 | |
| parent | e17b81ae7472f4f557c2158e5160e808a7354fe0 [diff] | |
| parent | 6df87bc9b62ad397a32e761732d3280086ff4831 [diff] |
am 6df87bc9: (-s ours) am d6d398e6: (-s ours) Import translations. DO NOT MERGE * commit '6df87bc9b62ad397a32e761732d3280086ff4831':