Merge "Basic file locking." into dalvik-dev
tree: 63bddb1d7aa13d6cbfed13c221be9dfe83f4999e
  1. build/
  2. oat_process/
  3. oat_runtime/
  4. src/
  5. test/
  6. tools/
  7. Android.mk