resolve conflicts w/bc4056
tree: d1f879e3f944bf8d933960212a85391cb9af2da3
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE