tree d15b00bc7fa75a3a574109fb1a331ff92e8f4cb5
parent 0b82b53b82de78acbd4c072c9ae75aeb401c0859
parent 3098987d226f6cf97d1849f882c753035c82a7d5
author Bill Yi <byi@google.com> 1466138583 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1466138583 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master