tree 353f576155047cfd493538fb3f105c56a612b80e
parent c51e999daf8ff355f1fb3f7721dbfedaa2da242a
parent f05491cb33339d109ba4cbe2aae8c2ed2b786182
author Qiwen Zhao <zhao@google.com> 1416419516 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416419516 +0000

am f05491cb: (-s ours) am 4b9f5e77: (-s ours) Import translations. DO NOT MERGE. update support library to 21.0.2 from lmp-sdk-release, build id 1585793

* commit 'f05491cb33339d109ba4cbe2aae8c2ed2b786182':
  Import translations. DO NOT MERGE. update support library to 21.0.2 from lmp-sdk-release, build id 1585793