| commit | 0898c57839f107a81cc0cb9838a7f078062371ee | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 22 17:50:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 22 17:50:39 2015 +0000 |
| tree | 20db03caf89960458504d9e2d5b0938e99550084 | |
| parent | c9f2387a75d1e1309c3e16ce653a620b1aee0c33 [diff] | |
| parent | 1b53e06fa39151e2617c43b239ff27efa70b4478 [diff] |
am 1b53e06f: (-s ours) am 210a6da6: (-s ours) Import translations. DO NOT MERGE * commit '1b53e06fa39151e2617c43b239ff27efa70b4478': Import translations. DO NOT MERGE