| commit | 1367ed0ed6e470218de3c0d5b8e2cf3575da4c74 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 17:15:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 17:15:52 2015 +0000 |
| tree | e4ff432eca97dc11a4bcf3e3d5366a9df36080cc | |
| parent | 82cb1d2d62841fc74ce6dfe4919780f45a52a3f4 [diff] | |
| parent | 12c4b02b36ce9d92b868ec2e92038730fe096999 [diff] |
am 12c4b02b: (-s ours) am 818b47a9: (-s ours) am 4477e6d5: (-s ours) Import translations. DO NOT MERGE * commit '12c4b02b36ce9d92b868ec2e92038730fe096999': Import translations. DO NOT MERGE