Merge "Add addPhoto API" into klp-dev
tree: dcf1ee76e4767e5127153f069dbdf9ba91fde391
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags