commit | 4ce2c654bda8f2a78bf4821ea39b146e626c8b60 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Dec 10 15:00:58 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 10 15:00:58 2014 +0000 |
tree | f561c1d693a9a1c691c9c436c5bb84020483d0d9 | |
parent | 83c26e18fc05a07b84698cb02b7a077102f90335 [diff] | |
parent | fa3f43145ac1af62ed063d3cd7ba1c30a81bb3fd [diff] |
am fa3f4314: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'fa3f43145ac1af62ed063d3cd7ba1c30a81bb3fd': Import translations. DO NOT MERGE