commit | a1da546b3acc3b6d8cb21d10f2712bc9e7b33587 | [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 | 42c7e065f59643abb68aa0a3fa159adfccaa8ce2 [diff] | |
parent | 889738c8f4dc075ce98ccd7b494b7de9eb3fe84c [diff] |
am 889738c8: (-s ours) am cc665090: (-s ours) Import translations. DO NOT MERGE * commit '889738c8f4dc075ce98ccd7b494b7de9eb3fe84c':