tree bc4f5d4a5022e763385ea5ad566197cafe460594
parent f94da0619c524ec9faf7def068d6888aa5304c96
parent 33877e15b8bfc50bd874027689a4794aa93b923d
author Craig Mautner <cmautner@google.com> 1349635854 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349635854 -0700

am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev

* commit '33877e15b8bfc50bd874027689a4794aa93b923d':
  Adds showWhenLocked attribute to Activities.