am 64574e9d: Merge "Remove obsolete/dead code"

* commit '64574e9d93c8bd2487f3d41ab253ae3d9cbce6ae':
  Remove obsolete/dead code
tree: 42f02b5a9ac593a3cea3217019184fafe28ca070
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags