tree b9238cd9ebb662cd7c405453cba02f1dbc64d0fa
parent c65074810694608b5f8f285dd931d12956cfe2d3
parent b42253e160b05060e13f7ea33fecee8b158a623c
author Chenjie Luo <cjluo@google.com> 1423455264 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423455264 +0000

am b42253e1: am be215ae0: Merge "Add assets to API level 22 to android.host.theme." into lmp-mr1-dev

* commit 'b42253e160b05060e13f7ea33fecee8b158a623c':
  Add assets to API level 22 to android.host.theme.