| commit | a5d3798c61a320d8d4842f8ea397eba6612d042d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 19:42:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 19:42:52 2014 +0000 |
| tree | cc421e0c71954c9355035fc7167e8c9ccedad3c1 | |
| parent | 0a978b13c8b67cb14eeddbd2e3ea5bd002b8b7a1 [diff] | |
| parent | 06e83b3d5ac9a7ec43ddd0ea9d1bf40c13e35484 [diff] |
am 06e83b3d: (-s ours) am d075d2f7: (-s ours) am 038c1444: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '06e83b3d5ac9a7ec43ddd0ea9d1bf40c13e35484': Import translations. DO NOT MERGE