| commit | 7c51c056b31cdd7a9fc6678823c5932d6f9fec4a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 00:44:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 00:44:27 2015 +0000 |
| tree | c4139c8d991713b44d1b46903603dd1fa32197bb | |
| parent | bf2d2ac2f82cbe4a64fa6a0d8bf0e5751eae4151 [diff] | |
| parent | 10b62bff6f172ee20359272cb4fb257498630a37 [diff] |
am 10b62bff: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '10b62bff6f172ee20359272cb4fb257498630a37': Import translations. DO NOT MERGE