tree 8ca64f68e895eec01df0b08e9d958908dcc6f4cf
parent 7d3db0dd28e6b99077568d37618a8fa44d6076f7
parent 8b25d04d323d85240627af066c9453e7f0bc215f
author Geoff Mendal <mendal@google.com> 1425911334 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1425911335 +0000

Merge "Import translations. DO NOT MERGE"