Kenny Root a2619da056 am d6dc45c3: am 125816a2: Merge "Failure to move .dex in eng builds is not fatal" into gingerbread ...

Merge commit 'd6dc45c30c1704fca9ec33f51c7c4ec1bee515ea'

* commit 'd6dc45c30c1704fca9ec33f51c7c4ec1bee515ea':
  Failure to move .dex in eng builds is not fatal

2010-08-05 11:46:32 -07:00

..

com/android/server

am d6dc45c3: am 125816a2: Merge "Failure to move .dex in eng builds is not fatal" into gingerbread

2010-08-05 11:46:32 -07:00

Android.mk

disable emma instrumentation for framework, ext and services (DO NOT MERGE)

2010-05-18 16:02:28 -07:00