am f3f2d731: Merge "DO NOT MERGE.  Integrate fragment work from master" into honeycomb-mr2

* commit 'f3f2d731e19bb47a87dc071a5750fc0f18248da2':
  DO NOT MERGE.  Integrate fragment work from master