tree 1678aa1dde998d320e62cdfd2b1783f111b5379b
parent 9df15f0c70c286c1701df41246eb08ea2a05870b
parent 88fc8e7e622bff425bc8e75312e800634677ae8b
author Bill Yi <byi@google.com> 1467349124 +0000
committer android-build-merger <android-build-merger@google.com> 1467349124 +0000

Import translations. DO NOT MERGE am: bb66b0c637  -s ours
am: 88fc8e7e62  -s ours

Change-Id: Ieb5fbc3ec55afcbe7a1ca7da2e7b58d6eda182e7