tree e8dd8a8e4062053edb4e8207c0f5c1ecb7550c17
parent 74ea3a0724cff6cd05fd200fe235f18238b5dc05
parent c8b25ba9674eec9e1435237c0fbba2968c81f60e
author Qiwen Zhao <zhao@google.com> 1415763767 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415763767 +0000

am c8b25ba9: (-s ours) am 23004759: (-s ours) Import translations. DO NOT MERGE Update support library to LSX30C  #1581297 automerge: 14c8d18  -s ours

* commit 'c8b25ba9674eec9e1435237c0fbba2968c81f60e':
  Import translations. DO NOT MERGE Update support library to LSX30C  #1581297