| commit | 5af2dd5c99f38034e730d24be5decead6cd5f043 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 01 20:07:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 01 20:07:45 2014 +0000 |
| tree | bdbd7282f3c1b0301e20224629b3c287c9ca4a24 | |
| parent | a097085f0fead90b0f081f641c4a1d8a8e8b7803 [diff] | |
| parent | 9259ad7282c428dcdefb8f00af40529b4cbe1a95 [diff] |
am 9259ad72: (-s ours) am f93c82ae: (-s ours) am f90404ca: (-s ours) am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '9259ad7282c428dcdefb8f00af40529b4cbe1a95': Import translations. DO NOT MERGE