Merge branch 'nosmap' into dev
authorNikita Kalyazin <n.kalyazin@samsung.com>
Wed, 5 Dec 2012 07:13:27 +0000 (11:13 +0400)
committerNikita Kalyazin <n.kalyazin@samsung.com>
Wed, 5 Dec 2012 07:13:27 +0000 (11:13 +0400)
commit515d5a401c5dbddd464bf05fc564179079d26e5a
tree84fb14cc5e05c56a765f1fe14a36a1ec5f50fba6
parentf12595daaa37de6e0f0a3e7ceabc303be6dd5a64
parent0af7bdc41e81a2cfea0fff0f665798388aadb8e7
Merge branch 'nosmap' into dev

Conflicts:
src/dalvik_probes/Makefile
src/modules/dalvik_handlers/handlers.c
driver/storage.c