commit | b241f0f307ebe11122216e269f7955e06350beaf | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Oct 23 17:30:33 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:30:33 2014 +0000 |
tree | cba62d0d64153aa2169651696bc238591341d679 | |
parent | 0a23ca9c06235e17d706a7bebc6c7de5422210f7 [diff] | |
parent | 313693b044331c02870f1259552ee28b442cf869 [diff] |
am 313693b0: (-s ours) am afce72a1: (-s ours) am 10daf361: (-s ours) am 0b4a8442: (-s ours) am 91c7f77d: (-s ours) am 29cff2d2: (-s ours) Import translations. DO NOT MERGE * commit '313693b044331c02870f1259552ee28b442cf869':