Reinstate more optimization, but avoid disagreement with dex by properly disabling...
authorsrowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Sat, 15 May 2010 11:28:01 +0000 (11:28 +0000)
committersrowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Sat, 15 May 2010 11:28:01 +0000 (11:28 +0000)
commit95dcb86e4d9766e82334fa947980f538a95343d9
tree98064b6f79cd9d7f4331adf8fdaf3b9fb3da1c2d
parent9ba879aa77a14e6a3d42b59c670937eeb64c706e
Reinstate more optimization, but avoid disagreement with dex by properly disabling the controversial optimizations: field and method merging, mostly

git-svn-id: http://zxing.googlecode.com/svn/trunk@1365 59b500cc-1b3d-0410-9834-0bbf25fbcc57
android/build.xml