am 85bccf6e: (-s ours) am 699a0969: Merge "DO NOT MERGE Removing an activity...
am 85bccf6e: (-s ours) am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb
* commit '85bccf6e':
DO NOT MERGE Removing an activity that shouldn't go into samples