OSDN Git Service

am 71e69160: am aee0c2ce: Merge "Use Context instead of Resources in Icon.createWithR...
authorDan Sandler <dsandler@android.com>
Fri, 15 May 2015 16:38:20 +0000 (16:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 May 2015 16:38:20 +0000 (16:38 +0000)
* commit '71e691600a7605db2dca7eee00b2b307260849f0':
  Use Context instead of Resources in Icon.createWithResource.


Trivial merge