tree c624083f1fbb89a8bec8c33a73e56f09bb3a171d
parent cb1b23b5e600abe542e3374b66c2be7976fccd72
parent b204e82e6e06ad7924bf2b0b1ce734ac51f0e387
author Geoff Mendal <mendal@google.com> 1391626560 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1391626561 +0000

Merge "Import translations. DO NOT MERGE"