tree e6e2f86227b1d6b46c1d02a7d32ec90644d1e12e
parent 15ca13865a72ae3c6ff6df12deae2fd2fca9185e
parent 0fe14154db1addcf9c5f9deef97dc43589140132
author Geoff Mendal <mendal@google.com> 1450287396 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1450287396 +0000

Merge "Import translations. DO NOT MERGE"