Merge "Assert lock/unlock/trylock sanity." into dalvik-dev
tree: 99a1f6667a64abffcfba9725826e3238f49dd347
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. Android.mk