| commit | a9a550dd8e87b33979670cf856838ba227500547 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 23:43:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 23:43:33 2014 +0000 |
| tree | 785f26135bcc7fd73181311e450c0c6211913426 | |
| parent | 17e9d2468fea360ab17679161f31cf6a38198fc7 [diff] | |
| parent | deddb38462389823c194559052c4d64ee6c3b467 [diff] |
am deddb384: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'deddb38462389823c194559052c4d64ee6c3b467': Import translations. DO NOT MERGE