am c85faea1: (-s ours) am cfbc6ea3: am 2a11de92: Merge "Integrate pinning support with drag and drop UI"

* commit 'c85faea1501cbf153b329f8991c1587e2e7b2885':
tree: f03503c967b8db75837f9840c6d72416dcb09cc8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags