| commit | 702c31a9c903fc19b687d5b4927c3cd5d2532f03 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Jul 18 01:26:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 18 01:26:45 2015 +0000 |
| tree | 17d92fadd67b4037d76382db6dd59970ff8632c0 | |
| parent | 97ac5b3963fdefe93dd233754b9f9612a21ca1a9 [diff] | |
| parent | b7bda2afdef6c21cf6c9d167afda3d2f79a40158 [diff] |
am 03cb97d2: (-s ours) am b8eb8f86: (-s ours) Import translations. DO NOT MERGE * commit '03cb97d21e787b765c639b91653e63dc2ebb9afe': Import translations. DO NOT MERGE