am fa9c7ec0: am 10d65592: Merge "Make directories always enabled, for realz." into klp-dev

* commit 'fa9c7ec0ee31fcb3cd12233e1969f52f1b79cd1d':
tree: 644d34866b42710264a3a58aae4b847f230d654f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml