tree ce04aeafcb96b199efc42b46813b02f7b2a08bcd
parent 6c604d616ff796f1ec41d4ad7212729cf469e8f5
parent e9c4dfaf9f7721501563edcf3f67184917c7c101
author Baligh Uddin <baligh@google.com> 1370622725 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1370622726 +0000

Merge "Import translations. DO NOT MERGE" into jb-mr2-dev