Merge "Restore bounds when we recreate the placeholder and progress drawables." into klp-ub-dev
tree: b94734e1183cd02028ccc494fb5e80fedd445c1f
  1. res/
  2. sample/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml