Filip Gruszczynski 99bcc3eee2 Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev

2015-06-01 15:42:42 +00:00

..

carrier

Update intents for CarrierService

2015-05-27 16:53:09 -07:00

chooser

Clarify example for Deep Share

2015-05-25 08:47:36 -07:00

dreams

Move PhoneWindow and friends back into internal package

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

gatekeeper

[LockSettings] migrate password attempt throttling to hardware

2015-05-26 19:48:51 -07:00

notification

Zen: Use account name instead of calendar id in event conditions.

2015-05-28 22:13:03 -04: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

…

trust

Allow dismissing Keyguard from TrustAgentService

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

voice

Add new API to set URI on AssistContent.

2015-05-28 11:44:58 -07:00

wallpaper

Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""

2015-05-27 15:36:10 -07:00