tree 3b576ef63e6b3807b4ef590cf62a33d9a7fde56a
parent eb6990ac93d03bde3842c454d02d6350bed213c1
parent 265160e03a9e3447a4874e5820108730dcd05194
author Jason Monk <jmonk@google.com> 1415305031 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415305031 +0000

am 265160e0: Merge "Show recents button while pinned and locked" into lmp-mr1-dev

* commit '265160e03a9e3447a4874e5820108730dcd05194':
  Show recents button while pinned and locked