Filip Gruszczynski c7becb7ee7 resolved conflicts for merge of 47249f2a to mnc-dev ...

This is a merge of chin support.

Change-Id: I436b751b3c4aaa6b46cfcdb475e02eedfa5a5635

2015-05-20 20:15:29 -07:00

..

carrier

Create unified BIND_CARRIER_SERVICES permission

2015-05-14 15:10:39 -07:00

chooser

Apply API feedback for ChooserTarget

2015-05-12 15:06:24 -07:00

dreams

Move PhoneWindow and friends back into internal package

2015-05-06 15:57:09 -07:00

gatekeeper

Clear secure user ID and notify keystore when lock is cleared

2015-04-16 16:31:50 -07:00

notification

Make all icon fields & extras sent to listeners backward-compatible.

2015-05-18 14:51:33 -07:00

persistentdata

Reset protection in PersistentDataBlockManager

2015-04-10 13:14:24 -04:00

restrictions

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

textservice

Spans should be preserved in TextInfo whenever possible

2014-07-10 03:07:01 +00:00

trust

Allow dismissing Keyguard from TrustAgentService

2015-04-17 01:12:30 +00:00

voice

Remove screenshot APIs.

2015-05-18 17:48:40 -07:00

wallpaper

resolved conflicts for merge of 47249f2a to mnc-dev

2015-05-20 20:15:29 -07:00