tree e53225e9ddd83a5eca379cf0c72c4481c7ad73d5
parent 2fb6609c318f1ba8ee75194c5cbc6de982a0a5a7
parent 3b50cf4ebb5ecf94bf7924ea3e0a0c3cb5efafd9
author Geoff Mendal <mendal@google.com> 1413849406 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1413849407 +0000

Merge "Import translations. DO NOT MERGE" into ub-now-queens