Julia Reynolds c72c931eb8 resolved conflicts for 429e7dcd to master ...

Change-Id: Id0aca75915a054253d032d333defba1a38b80abe

2015-10-16 16:25:40 -04:00

..

carrier

Update CarrierService long lived binding API

2015-06-23 14:31:13 -07:00

chooser

Update ChooserTarget constructor to take ComponentName, Bundle

2015-07-16 16:29:59 -07:00

dreams

Improve tracking of screen on reasons.

2015-07-15 09:59:07 -07:00

gatekeeper

[LockSettings] migrate password attempt throttling to hardware

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

media

Fix API review: Camera prewarm

2015-06-01 18:01:20 -07:00

notification

resolved conflicts for 429e7dcd to master

2015-10-16 16:25:40 -04:00

persistentdata

Remove FRP wipe support for device initializers

2015-06-11 14:00:56 -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

Work on issue #21516866: Implement voice interaction in ResolverActivity

2015-07-28 12:52:11 -07:00

wallpaper

am aabc9869: am 03850591: Handle outsets when resized is called due to rotation.

2015-07-02 00:59:48 +00:00