tree c14edce087b95caca3561821bfea52eb521ece7c
parent 4708550ab413d0120cfe0d93daf6f200e49be625
parent e084814474c9788dfebfd62caf59d5a298712052
author Geoff Mendal <mendal@google.com> 1427115759 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1427115760 +0000

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev