tree 2d25eb454a9ca5f3508465c3edd7848a861d37d1
parent 11a3bc702b918e0feb251741e070c37b7a604f25
parent 1267727241c941af42faf19bfc1e21034112e0da
author Jim Miller <jaggies@google.com> 1381362680 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381362680 -0700

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

* commit '1267727241c941af42faf19bfc1e21034112e0da':
  Have SearchPanel fade camera and search buttons when activated