| commit | e5b113e048c90502c90d598359f4debf51d331c3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 14:31:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 14:31:00 2015 +0000 |
| tree | bdd2d1316de05a792e8742a0ebfed59ec8604235 | |
| parent | 9ec7b66a821bcf179027f9412fc829c0d1e58743 [diff] | |
| parent | 741b3c271d70514cddc553a0b0daa6a8079c39cb [diff] |
am 741b3c27: (-s ours) am 2e7b1f4f: (-s ours) Import translations. DO NOT MERGE * commit '741b3c271d70514cddc553a0b0daa6a8079c39cb': Import translations. DO NOT MERGE