Merge "UI updates when saving lock task fails" into pi-dev
tree: 0d20ddc797baaf6cde660ecbce8dce293ebd513d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml