tree 1bc2fddc88565322785faff2b59bc61b8fa5434e
parent f634bc0ff507ebbaae5a8eaed52efa5706fc0208
parent 4248f74eeab9b097f7d7862c43d9800e18b77374
author Geoff Mendal <mendal@google.com> 1389645232 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1389645233 +0000

Merge "Import translations. DO NOT MERGE"