tree 7db9f4d874c2fa374e63ca0824295d178a72323a
parent 34dd12670f785591bde8de125236ed1f4fdceac9
parent 5212c88bcdf4f7eecd7ce405d608e9d465880f1d
author Bill Yi <byi@google.com> 1497339947 +0000
committer android-build-merger <android-build-merger@google.com> 1497339947 +0000

Import translations. DO NOT MERGE
am: 5212c88bcd  -s ours

Change-Id: I13ed1554d0ceedf3f48b4a60b43575cd256883db