Merge "rename Decoration class name"
tree: 7863fd29710f213c350d849bf64ddaabaaebf30b
  1. Android.mk
  2. AndroidManifest.xml
  3. res/
  4. src/