Craig Mautner 3f339d8193 am 88cfdae6: am cdd82540: Merge "When waiting for activity to finish don\'t reset" into klp-dev
* commit '88cfdae667bd85931c1bf81781a54472a8fe3ac7':
  When waiting for activity to finish don't reset
2013-09-10 15:17:23 -07:00
..
2013-04-09 21:54:12 -07:00
2013-09-05 15:58:24 -07:00