Merge branch 'dev' of 106.109.8.71:/srv/git/dbi_new_build into dev
authorSergey Grekhov <grekhov.s@samsung.com>
Thu, 18 Aug 2011 06:04:21 +0000 (10:04 +0400)
committerSergey Grekhov <grekhov.s@samsung.com>
Thu, 18 Aug 2011 06:04:21 +0000 (10:04 +0400)
commitf55ab287e61ee50def56355ca87de748aaefd8f6
treed12c6fe6d08d2c863b680630f44fdf443087103e
parentbe2bf308539698512866f1dbe0e7a6abba6936f2
parent28266155892c7273cce9def9e3c9b75778bb6e18
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi_new_build into dev

Conflicts:
src/dalvik_probes/Makefile.am