| commit | 4a563883c5624839e8c14aa696ec2cdfbc90c86d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 12 22:45:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 22:45:46 2014 +0000 |
| tree | 39dd9c52e83a4a4a97b786db8f47935c5374ffad | |
| parent | 5979512b1643d3c8c9693a9f7d0d79981a956e7b [diff] | |
| parent | 02ea60664b85b31be5d4052c52787d0ec2865842 [diff] |
am 02ea6066: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '02ea60664b85b31be5d4052c52787d0ec2865842': Import translations. DO NOT MERGE