| commit | 03008f7ad7470d1252024e15783f46c371643e22 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Oct 27 18:51:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 18:51:09 2014 +0000 |
| tree | 35177ce3c6cf8d873ea0f220bd9dc71fa69105f3 | |
| parent | efe4e347f0392d1d715891072fd05c0621bb915d [diff] | |
| parent | e44d39effbbf5d722d54ca6b97ce61d9ed855e41 [diff] |
am e44d39ef: (-s ours) am 5dd9e4ae: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'e44d39effbbf5d722d54ca6b97ce61d9ed855e41':