Amith Yamasani 7e81dd274f Merge "Have UserManagerService clear the restrictions and unblock apps"

2013-07-19 19:48:21 +00:00

..

java

Merge "Have UserManagerService clear the restrictions and unblock apps"

2013-07-19 19:48:21 +00:00

jni

Merge "LocalSocket: Add support for SOCK_DGRAM and SOCK_SEQPACKET"

2013-07-19 17:39:28 +00:00

res

Merge "Have UserManagerService clear the restrictions and unblock apps"

2013-07-19 19:48:21 +00:00

tests

am b8292830: resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp

2013-06-28 16:53:27 -07:00