am d1c32480: am fa28e3e4: Merge "Use a separate apk module definition to add...
am d1c32480: am fa28e3e4: Merge "Use a separate apk module definition to add core-tests resource." into gingerbread
* commit 'd1c32480':
Use a separate apk module definition to add core-tests resource.