tree f6a668f4672d96a64d343e8a65a577961f754600
parent ea917e5206c2123723b6dbbacca5bdce1c066aed
parent cdd4f84e0651554853d96f3795bbe276ab884fbb
author Bill Yi <byi@google.com> 1469631917 +0000
committer android-build-merger <android-build-merger@google.com> 1469631917 +0000

Import translations. DO NOT MERGE
am: cdd4f84e06  -s ours

Change-Id: I6e14618caf9ce565b28148fe75827416fc1894cc