| commit | 2f5e130d4d16eb80e72e492230dec843e1d2c9b2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Dec 10 17:13:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 10 17:13:19 2014 +0000 |
| tree | 56ecb5b9c83a1ae6aa8d2997c459eea7111b81d0 | |
| parent | 864280369ca45f9a93f4cfe9c1d020e0cbe0d7ed [diff] | |
| parent | 295dc00409b295d4353eefa6131189a83a29ea5f [diff] |
am 295dc004: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '295dc00409b295d4353eefa6131189a83a29ea5f': Import translations. DO NOT MERGE