tree 79b8f627ea722c5799d45cf0c9ed0305be8d1ae8
parent 1960354295716c6c4755b917e42e24efec6ca8dc
parent ef51dc7acf907a687e4a824cea3fdc6f42af3baf
author Chris Banes <chrisbanes@google.com> 1434123788 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434123788 +0000

am ef51dc7a: Merge "Add filter API to Palette" into lmp-mr1-ub-dev

* commit 'ef51dc7acf907a687e4a824cea3fdc6f42af3baf':
  Add filter API to Palette