Merge "Fix NPE in markDropArea" into lmp-mr1-dev
tree: 1e26e0e5b78f2157d4ae2bd0e0fcabe964c31c64
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags