| commit | 1e0ecf870fbadd98ed0ec5cb9192f41a663d38cc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 06 15:17:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 06 15:17:01 2015 +0000 |
| tree | 3e4be930d63c53f798eb8b63a0a3fda5e7bc1c43 | |
| parent | 47c0c13464d2756db9c0e839d7f96114b92420c7 [diff] | |
| parent | 99f71e0f53a387ce376486c7825f301b7e6bfbe5 [diff] |
am 99f71e0f: (-s ours) am 0356bca6: (-s ours) Import translations. DO NOT MERGE * commit '99f71e0f53a387ce376486c7825f301b7e6bfbe5': Import translations. DO NOT MERGE