tree 5e8d0aadca57bc428e2ab6a5ad54f95f7f076a45
parent 557fa1ba0009c52290aed18b07e95130dbb7ef73
parent 03c19cee1ca33c67899d43fe8c6eccf2b1a4b911
author Qiwen Zhao <zhao@google.com> 1425929047 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425929047 +0000

am 03c19cee: (-s ours) update SDK and support lib. DO NOT MERGE ANYWHERE.

* commit '03c19cee1ca33c67899d43fe8c6eccf2b1a4b911':
  update SDK and support lib. DO NOT MERGE ANYWHERE.