tree f8d3d3cc6723cd2e7e46ab8f0bd1ff38206468f1
parent fe8910201bd4a0c956f1b8361a5f489f40f9d122
parent e1264384b4955d807b9653c9259169640ca869c1
author Bill Yi <byi@google.com> 1464998890 +0000
committer android-build-merger <android-build-merger@google.com> 1464998890 +0000

Import translations. DO NOT MERGE am: ba35e1f170  -s ours
am: e1264384b4  -s ours

* commit 'e1264384b4955d807b9653c9259169640ca869c1':
  Import translations. DO NOT MERGE

Change-Id: I989c64f6fe8209d0dd8ad70cc93e931395552340