| commit | af20f19bee7d917c4037cfd62a3ed5286269df21 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 27 18:50:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 18:50:30 2014 +0000 |
| tree | fbbf1af8b3273ee69e60750c87c447c0c013dd1e | |
| parent | a51c0c907626203b6bbc6af979534ed08d3c4026 [diff] | |
| parent | 23463caa6ddf6e09d0f785dd6146264c0b043c2b [diff] |
am 23463caa: (-s ours) am 13db1832: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '23463caa6ddf6e09d0f785dd6146264c0b043c2b':