tree 132f96476dee4c3dc8ed87184cfeca3fcf905d33
parent db3ace21268ff06b4ebc8733cc8ed3ae9e3091ec
parent 67389e0acec6877528c4cdaed99bf0a295bf74b9
author Adam Powell <adamp@google.com> 1360014529 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360014529 -0800

am 67389e0a: Merge "Fix regression in expanded action view up" into jb-mr1.1-dev

# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '67389e0acec6877528c4cdaed99bf0a295bf74b9':
  Fix regression in expanded action view up