tree 4f8c947c1db173e049d12e8bc72a15c0439f1d39
parent cbd495b4bda74b1d3e55060abd5c9aac385ef45b
parent 36c3a4556e883870d5ac1c2b006199b88d41ea68
author Bill Yi <byi@google.com> 1464283728 +0000
committer android-build-merger <android-build-merger@google.com> 1464283728 +0000

Import translations. DO NOT MERGE
am: 36c3a4556e  -s ours

* commit '36c3a4556e883870d5ac1c2b006199b88d41ea68':
  Import translations. DO NOT MERGE

Change-Id: If1b435143b95a8472dcbcbfe595cd64234d58edc