am 93e8e0a0: (-s ours) am e01c162a: am efb70fd8: Merge "Cherry pick beefed-up error handling in the CopyService from master.  DO NOT MERGE" into mnc-dev

* commit '93e8e0a08e7355a5bfd03c1660785a1b9517af3c':
  Cherry pick beefed-up error handling in the CopyService from master.  DO NOT MERGE
tree: 3067370926feab2f8a74a445100ecf8dea69f8e1
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py