| commit | ec08d889a1b6e35742bcc1bac72fd7a40b5b2a4e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jan 07 17:07:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 07 17:07:26 2015 +0000 |
| tree | bb1769cc67ed678adaa555dcfc3eb4af71b251f4 | |
| parent | 6a3e70159cbbd3c4b7df89165c280ea4f7d56fa5 [diff] | |
| parent | 56db82282d701c81cedb38b246716e406c2158ff [diff] |
am 56db8228: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '56db82282d701c81cedb38b246716e406c2158ff': Import translations. DO NOT MERGE