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