Merge "Adjustments to android property backend."
tree: 64e292b2d35738c2f11b22e9ed69f2ea4258c364
  1. include/
  2. src/
  3. Android.mk
  4. NOTICE