tree 45734f823b115abe994c84946c691e6c942e14a7
parent 2ccb1126338fc61429f1578fc6517c4a6db116d8
parent 9906e784faca2cc8388a04fdc544722ea93d51be
author Dianne Hackborn <hackbod@google.com> 1340673435 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340673435 -0700

am 9906e784: am 17990395: Merge "Fix issue #6717667: expanded notification actions don\'t work on the lock screen" into jb-dev

* commit '9906e784faca2cc8388a04fdc544722ea93d51be':
  Fix issue #6717667: expanded notification actions don't work on the lock screen