| commit | edf46f3c66b0771b5dae441b9078efdc036080c8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 12 23:50:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 23:50:16 2014 +0000 |
| tree | d950f4708d2eb82cf57290a6982db5d3d7a4ff57 | |
| parent | 536b3ff237c78497f19d83a38c2679869a1b24cd [diff] | |
| parent | 4a563883c5624839e8c14aa696ec2cdfbc90c86d [diff] |
am 4a563883: (-s ours) am 02ea6066: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '4a563883c5624839e8c14aa696ec2cdfbc90c86d': Import translations. DO NOT MERGE