| commit | 896262ef52c5de199d1ab3e59cab4f8efc2e37e8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon May 04 12:52:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 04 12:52:11 2015 +0000 |
| tree | e7c2cb51ce3ddc043100830aa9b7cb8572b6895e | |
| parent | 1c562bbb610ef83f328b53d88e4958383aea824c [diff] | |
| parent | 577e34c9ebbf1ff09a6341e388795dec2c4fa92f [diff] |
am 577e34c9: (-s ours) am 3f2f2cbb: (-s ours) Import translations. DO NOT MERGE * commit '577e34c9ebbf1ff09a6341e388795dec2c4fa92f': Import translations. DO NOT MERGE