Adam Powell 0fdf7c326a Merge "Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev am: e89dc40706 am: a53d9cace1" into nyc-mr1-dev-plus-aosp ...

am: 60c73947d0

* commit '60c73947d087c8272889d7b8a600b59d391cd98c':
  Show package icon/label for resolved package-targeted implicit intents

Change-Id: Id1db07816cc5437b4099123b663e32736283c327

2016-05-13 17:23:25 +00:00

..

java

Merge "Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev am: e89dc40706 am: a53d9cace1" into nyc-mr1-dev-plus-aosp

2016-05-13 17:23:25 +00:00

jni

resolve merge conflicts of bc90502 to nyc-dev-plus-aosp am: f6ebf375e4

2016-05-13 16:08:58 +00:00

res

Merge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev am: 614c83d977 am: 04250248b9

2016-05-13 01:02:58 +00:00

tests

Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev am: de66540fd3 am: 443c032e52

2016-05-06 22:03:18 +00:00