am 3160a3c6: Merge "Remove dead code" into lmp-mr1-dev

* commit '3160a3c61282f944991b349bf44013d0f03122ce':
  Remove dead code
tree: f9cd1a3044664f74b297ff6e58fab2f8a1e56fb3
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags