tree a1d87b4d21aeb58a3548d1ab29787f68ac06d179
parent a292f032d6c987f0f0ef412b543aed9fde258111
parent 7e49438355f2826b3af18b7a4e71aa52e763de7c
author Bill Yi <byi@google.com> 1464997088 +0000
committer android-build-merger <android-build-merger@google.com> 1464997088 +0000

Import translations. DO NOT MERGE
am: 7e49438355  -s ours

* commit '7e49438355f2826b3af18b7a4e71aa52e763de7c':
  Import translations. DO NOT MERGE

Change-Id: I249fbc05f0c7741bc84fd76ed108916809fa8b3f