tree 39800dc75722980a34ec3ce45d49fe1d17615cdf
parent 1a30dd5232aaeb97dd0f57b3e1256d5ebb554b13
parent de33bf03a2fc14431807626c33e0c698370749e9
author Michael Jurka <mikejurka@google.com> 1335826051 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335826051 -0700

am de33bf03: Merge "Allow search/voice toolbar icons to live in same activity" into jb-dev

* commit 'de33bf03a2fc14431807626c33e0c698370749e9':
  Allow search/voice toolbar icons to live in same activity