| commit | 67008a598da8cc73b035bbc93b25166b1c058a89 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 22 13:58:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 22 13:58:38 2015 +0000 |
| tree | 999ec56c09b7f188e75f6dcb40b3b779a0cb60f2 | |
| parent | 3f287849a9844cb2f9072cf0f135a20a14eefa72 [diff] | |
| parent | 158ce5ce84e4226118e8e2102cb712cfd77dfb21 [diff] |
am 158ce5ce: (-s ours) am 689721da: (-s ours) am 77b6b0eb: (-s ours) Import translations. DO NOT MERGE * commit '158ce5ce84e4226118e8e2102cb712cfd77dfb21': Import translations. DO NOT MERGE