Chad Jones 1fb5528643 resolved conflicts for merge of 57bb5f5c to master ...

Change-Id: Id5dfe7fc919305658312771a031c0764cef5515c

2015-02-23 21:19:58 -08:00

..

accessibility

Resolved conflict for merge of 4a0e0237 to master

2015-02-18 18:40:20 -08:00

appwidget

Remove widgets for packages no longer whitelisted by admin

2015-02-17 20:33:36 +00:00

backup

resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 12:37:12 -08:00

core

resolved conflicts for merge of 57bb5f5c to master

2015-02-23 21:19:58 -08:00

devicepolicy

Merge "Dump the profile/device owner when dumping device policy state."

2015-02-20 10:33:18 +00:00

java/com/android/server

Move AudioService to services.

2015-02-09 17:13:38 -05:00

print

…

restrictions

…

tests

Remove deprecated version of setProfileOwner that takes packageName

2014-12-24 09:38:13 +00:00

usage

…

usb

Add MIDI Manager API tweaks:

2015-02-23 14:32:23 -08:00

voiceinteraction

Update voice interaction layer for new UI design.

2015-02-13 11:27:57 -08:00

Android.mk

…