am 12c7a0c9: Merge "More UX updates around picking images." into klp-dev

* commit '12c7a0c970dfa56391f1e7f7a8ed41348acb14c4':
  More UX updates around picking images.
tree: 88d6df4c92bec1665c3842c5bb4481bba0f92573
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml