tree e547bc71e8017dbee9e13516a5dfbbaf070c018e
parent 1f5c1f3eee2df06ae42bc9e2bb9b5502316502cc
parent 984c826f59e8b2a245b7fe9f304cbb5b06cb81ad
author Baligh Uddin <baligh@google.com> 1381537588 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1381537588 +0000

Merge "Import translations. DO NOT MERGE" into klp-ub-dev