commit | c63bd5bf42cb48caa659417863182f625b384959 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:22:47 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:22:47 2014 +0000 |
tree | 8745c9b3956d8540c911f68c96ccfa13c76451ad | |
parent | 4f92101732a80539fd62c5e8ce093a78c631554f [diff] | |
parent | f6d289f48c8f10eb4ade70697e6f01d5eccd1b09 [diff] |
am f6d289f4: (-s ours) am d56b9e88: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'f6d289f48c8f10eb4ade70697e6f01d5eccd1b09': Import translations. DO NOT MERGE