Elliott Hughes f6ebf375e4 resolve merge conflicts of bc90502 to nyc-dev-plus-aosp ...

Change-Id: Ic78042d45085718b2220107e9a84767df316440a

2016-05-13 08:57:40 -07:00

..

java

Merge "Close leaked windows when trying to preserve main one" into nyc-dev

2016-05-13 03:30:45 +00:00

jni

resolve merge conflicts of bc90502 to nyc-dev-plus-aosp

2016-05-13 08:57:40 -07:00

res

Merge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev

2016-05-13 00:54:08 +00:00

tests

Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev

2016-05-06 21:53:39 +00:00