merge in jb-mr1-release history after reset to jb-mr1-dev
tree: e58614f5548035885152f8a57c8a709852f2e3df
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml