commit | 1c2274603898dde95eee5caa227fd2bf9133cc3e | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Aug 13 00:36:03 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 13 00:36:03 2013 -0700 |
tree | 8981f565566ea39c2741565f4607efcd96d4be88 | |
parent | 4a4865b00054514cbb9d9d3205a861cd418a2dfb [diff] | |
parent | 61c9706bac583a1cf95be12d7f5e96f652669d72 [diff] |
am 61c9706b: (-s ours) am 43e56c4a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '61c9706bac583a1cf95be12d7f5e96f652669d72': Import translations. DO NOT MERGE