| commit | b92cb150473914c8bc9396aa6dc674054f296882 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Oct 27 18:51:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 18:51:02 2014 +0000 |
| tree | 35177ce3c6cf8d873ea0f220bd9dc71fa69105f3 | |
| parent | faa470d1cf407c3be4aad7a2242248d58e3f053e [diff] | |
| parent | 7e589b15fb5effb63b4e6eec5732eb9e9f972c6f [diff] |
am 7e589b15: (-s ours) am 93321a10: (-s ours) am ed04bd9e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '7e589b15fb5effb63b4e6eec5732eb9e9f972c6f':