tree 649530ced5dbc8cdede5f961a6557381c830e5ce
parent d37638e5262fea65bf428cb78e73a9b4e02a93fe
parent 7de6672943e9526cc774f97b5118dee4a2e59ba9
author Jim Miller <jaggies@google.com> 1381362862 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381362862 -0700

am 7de66729: am 12677272: Merge "Have SearchPanel fade camera and search buttons when activated" into klp-dev

* commit '7de6672943e9526cc774f97b5118dee4a2e59ba9':
  Have SearchPanel fade camera and search buttons when activated