tree e8dd8a8e4062053edb4e8207c0f5c1ecb7550c17
parent d0263520d1565dcf27126510a60279648cba95b5
parent 6238b555de258aa7206093d3c711b3d04090072c
author Qiwen Zhao <zhao@google.com> 1415662143 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415662143 +0000

am 6238b555: (-s ours) Import translations. DO NOT MERGE - Update prebuilt SDK to LMX41

* commit '6238b555de258aa7206093d3c711b3d04090072c':
  Import translations. DO NOT MERGE - Update prebuilt SDK to LMX41