Craig Mautner 337aa27a63 am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev
* commit '8ee7ac22e6aec5df5405a3e2130d593c50bc39b2':
  Adds showWhenLocked attribute to Activities.
2012-10-07 11:53:43 -07:00
..
2012-07-25 18:56:16 -07:00