| commit | d3c5d3f59450fe907ccdb79a43e7b5d1096507e8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 16:34:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 16:34:29 2015 +0000 |
| tree | 4166f35e207a2990be6928d39dcc40a24f208838 | |
| parent | 4588065664a5791225affef44af12eb53a5f7e31 [diff] | |
| parent | 3d6f78121b50f587546ea8dd6830d1f2e96fd5c4 [diff] |
am 3d6f7812: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '3d6f78121b50f587546ea8dd6830d1f2e96fd5c4': Import translations. DO NOT MERGE