commit | 11d451ab10438442786d19a1fd866803b374fde1 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Sep 24 18:09:51 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 24 18:09:51 2014 +0000 |
tree | 499c28dc24b8f7bcc1a9cd04398a47a6825f412e | |
parent | 6589e36d3163292ecca1afe5a2562bb77e4c0ef7 [diff] | |
parent | 3f35305928221c87e58ae8281c6a41461f6c11aa [diff] |
am af1d623d: (-s ours) am 0f77230a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'af1d623d074328bf40a0c2e6199ea6ffe1f8935f': Import translations. DO NOT MERGE