| commit | 041c469d9694377bf36296903e48571e2876b0d5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed May 27 14:17:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 27 14:17:57 2015 +0000 |
| tree | 5f7629fcee6e9dfc55cd9d06858871f826a7adea | |
| parent | a64cca7fe06b78fc57848a4a1378e0006469e857 [diff] | |
| parent | d56fdd20460e8499b6ef7b8f3559d7caf2a4523a [diff] |
am d56fdd20: (-s ours) am 5e7c1682: (-s ours) Import translations. DO NOT MERGE * commit 'd56fdd20460e8499b6ef7b8f3559d7caf2a4523a': Import translations. DO NOT MERGE