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