| commit | 3c0d8fcf80b2e15548f590420c91b1f684730a3a | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Aug 22 18:53:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 22 18:53:43 2014 +0000 |
| tree | fb4d598dd587dbef59de8a4d5bf39941b4d1427e | |
| parent | 075947ab24b90d0f10594478750c4c87563433b6 [diff] | |
| parent | eda140e7203c66863690c2d96d28ec56c954dae4 [diff] |
am eda140e7: (-s ours) am 309b1253: (-s ours) am 01408739: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'eda140e7203c66863690c2d96d28ec56c954dae4': Import translations. DO NOT MERGE