commit | d63cdafebd6129aa796a8996acc75fb5a6026db6 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Oct 27 05:38:17 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 05:38:17 2014 +0000 |
tree | 5babd8338e5cd14b2492ab6013943919e004ae43 | |
parent | a1da546b3acc3b6d8cb21d10f2712bc9e7b33587 [diff] | |
parent | 96510f123eb98c9ec7d02747f18ec67827051913 [diff] |
am 96510f12: (-s ours) am 4f365804: (-s ours) Import translations. DO NOT MERGE * commit '96510f123eb98c9ec7d02747f18ec67827051913':