am c150c723: Merge "Use ShapeDrawable for floating action button"

* commit 'c150c723eae0c4d2c05d570604db3c79fe7ef913':
  Use ShapeDrawable for floating action button
tree: ab0de23340e008692053afe7cbbf59fbbd2d00d8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags