tree 520a58554b9eee9b6af7dd7e0c5da0e5a6aa32f0
parent dfa8d02861ac2afb7addcb884b58dd009e2f212e
parent 07cf971e58aecab76f2b5b575cfe62120005c6e4
author Adam Powell <adamp@google.com> 1360111861 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360111861 -0800

am 07cf971e: Fix re-enabled state of up after action view collapse

# Via Adam Powell
* commit '07cf971e58aecab76f2b5b575cfe62120005c6e4':
  Fix re-enabled state of up after action view collapse