am e2c62252: Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread
am e2c62252: Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread

Merge commit 'e2c622524116b49d5817fedf1d88e2bb1521a9ec' into gingerbread-plus-aosp

* commit 'e2c622524116b49d5817fedf1d88e2bb1521a9ec':
  Instrumentation links against the jar file for its app, so use that at the dependency.

hagar006/platform_manifest,ND-3500/platform_manifest,xorware/android_build,xorware/android_build,Hybrid-Power/startsync,xorware/android_build,RR-msm7x30/platform_manifest,xorware/android_build,see4ri/lolili,fallouttester/platform_manifest,pranav01/platform_manifest,knone1/platform_manifest,xorware/android_build