Craig Mautner 8565363126 am 337aa27a: am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev
* commit '337aa27a6307e0f40705ee676551dda4bf6cb894':
  Adds showWhenLocked attribute to Activities.
2012-10-07 11:55:58 -07:00
..
2012-09-25 17:14:22 -07:00