am 71e69160: am aee0c2ce: Merge "Use Context instead of Resources in...
am 71e69160: am aee0c2ce: Merge "Use Context instead of Resources in Icon.createWithResource." into mnc-dev
* commit '71e69160':
Use Context instead of Resources in Icon.createWithResource.