am 6711cc9a: am 247e85f5: Merge "Fix incorrectly reporting device owner already present." into lmp-dev

* commit '6711cc9a7a5998761e8f205b8e23fc5796a4e8fe':
  Fix incorrectly reporting device owner already present.
tree: e8f336362e43de9b3b2e50bb87e7ef6406b6e06d
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml