am eaf7d3bd: am 4ad916ec: am ce5effba: Merge "Fix NPE in markDropArea" into lmp-mr1-dev

* commit 'eaf7d3bdf1d7b94f3181dfe72ac701d7887c17ad':
  Fix NPE in markDropArea
tree: 29a75747262f51fde0f484aa7cc5209a54ee0758
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags