am b8a48da2: am 5e1a5e5b: Merge "Create unique files, root ordering, UI bugs." into klp-dev

* commit 'b8a48da2a707720a105584f1b8dc087a6dd9c887':
  Create unique files, root ordering, UI bugs.
tree: 659da3c5a20e1c9412e410093df9c617e5729f2a
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml