| commit | 39befa785c1fdbbbd72e10ea0aea7a6f6e09febc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:19:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:19:07 2015 +0000 |
| tree | dde12831e3589ec9f2f2bd657262786dc7c94ae4 | |
| parent | e7382bb53ca367ba4131d3213be618c80cbe0c5f [diff] | |
| parent | 3d26af838690fddf9227050b18c8b03441b602c1 [diff] |
am 3d26af83: (-s ours) am 341f7ea7: (-s ours) am 8dc2209e: (-s ours) am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '3d26af838690fddf9227050b18c8b03441b602c1':