Craig Mautner 8ee7ac22e6 am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev
* commit '33877e15b8bfc50bd874027689a4794aa93b923d':
  Adds showWhenLocked attribute to Activities.
2012-10-07 11:50:54 -07:00
..
2011-10-06 10:50:09 -07:00
2012-07-25 18:56:16 -07:00