| commit | 4795dfba7fb5f7c03e1f85ec2464258f4987d364 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 19:22:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 19:22:48 2014 +0000 |
| tree | 97e76a57397889e1195f5af333795578efe1f01d | |
| parent | b6f5cb3e45c9d4cf891d0ee024e7073f6d139677 [diff] | |
| parent | 3647aba82d30143e301d4bb251085f79308d872a [diff] |
am 3647aba8: (-s ours) am ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '3647aba82d30143e301d4bb251085f79308d872a': Import translations. DO NOT MERGE