tree ebc8d878f70a08dacbc4520d8c3520dfeac7be25
parent c5947f8b761b7f5ec2b788f56b1c21ee742c6c25
parent a59ad81849f8625795938c6d741401877668da5e
author Geoff Mendal <mendal@google.com> 1454522105 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1454522105 +0000

Merge "Import translations. DO NOT MERGE"