| commit | efe4e347f0392d1d715891072fd05c0621bb915d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Oct 27 18:51:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 18:51:07 2014 +0000 |
| tree | 35177ce3c6cf8d873ea0f220bd9dc71fa69105f3 | |
| parent | 34cae37601e6bf3913e421f290a22a3cdf2b6ea0 [diff] | |
| parent | 5a31bb1db5cae3d62c04007a32666dcbb1044d67 [diff] |
am 5a31bb1d: (-s ours) am 1222cac5: (-s ours) Import translations. DO NOT MERGE * commit '5a31bb1db5cae3d62c04007a32666dcbb1044d67':