| commit | d6557581541f067035aaa0a39febdf719a4e8946 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 23:37:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 23:37:44 2015 +0000 |
| tree | 466eabd9fb9bc9bb3962647ab583e7bad505e918 | |
| parent | a16ac39ed2faf219be153270b62eeee375c19152 [diff] | |
| parent | 7c69964c33ed0c8280dbfef34cbe025cff65efbc [diff] |
am 7c69964c: (-s ours) am 9635e64e: (-s ours) Import translations. DO NOT MERGE * commit '7c69964c33ed0c8280dbfef34cbe025cff65efbc': Import translations. DO NOT MERGE