tree a30c7dde8bee2d6bf9a4b25b65501b7418bcb558
parent 2c64b53976a99f28bc7c0612648581f9b93bf8b0
parent 5a32ec323784ad7926bb9dc3b3678c9b60d3a4ba
author Adam Powell <adamp@google.com> 1358983458 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358983458 -0800

am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev

# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '5a32ec323784ad7926bb9dc3b3678c9b60d3a4ba':
  Prevent simultaneous interaction with action bar and content