Merge "Remove use of macro to pull in dependencies" into pi-dev
tree: 1968127ad16da2afd16ac0af1f2b95032ab091d7
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg