Julia Reynolds 4e3455aebf Merge "Merge "Do not bundle cross user." into nyc-dev am: 68a32b5aad am: b15ecad14c" into nyc-mr1-dev-plus-aosp ...

am: f5b62afe86

* commit 'f5b62afe86c0118260f5ee82890c12868dcbd90f':
  Do not bundle cross user.

Change-Id: If5163d7bf39f0a086b6b66f39115c366d053d618

2016-05-11 17:32:57 +00:00

..

java

Merge "Merge "Do not bundle cross user." into nyc-dev am: 68a32b5aad am: b15ecad14c" into nyc-mr1-dev-plus-aosp

2016-05-11 17:32:57 +00:00

jni

Merge "ContextHub: Avoid reference leaks" into nyc-dev am: 5ee41098b0 am: 6bc9aa241c

2016-05-09 20:16:33 +00:00

res

Merge "Merge "Update docs for DELETE_PACKAGES permission." into nyc-dev am: 0e351a945b am: ca8ecc0be1" into nyc-mr1-dev-plus-aosp

2016-05-10 20:39:14 +00:00

tests

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

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