am e2c62252: Merge "Instrumentation links against the jar file for its app, so...
am e2c62252: Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread
Merge commit 'e2c62252' into gingerbread-plus-aosp
* commit 'e2c62252':
Instrumentation links against the jar file for its app, so use that at the dependency.