Brian Carlstrom ce8bf86d6d Merge "Fixes for sm and pm usage" am: ffb15da518 am: 671d5965f7
am: f73e78fe1c

* commit 'f73e78fe1cb6803a29f7f85b49792f4e8a7350c8':
  Fixes for sm and pm usage
2015-11-05 18:55:49 +00:00
..
2015-10-20 13:23:18 -07:00
2015-11-05 10:33:40 -08:00
2015-08-24 16:42:37 +00:00