Lorenzo Colitti ffba84a155 am b0dfaad8: am f99551d8: am c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev ...

automerge: fd90d71

* commit 'fd90d718f43e676e6487ca089e058cdc5d7f7981':
  Make reportInetCondition revalidate if the report differs from our state

2015-02-12 07:51:11 +00:00

..

accessibility

Fix broken activation of the selected view in accessibility mode. automerge: ded133c automerge: b6b526e

2015-02-03 07:31:28 +00:00

appwidget

Restored widget provider id not properly updated.

2014-10-08 03:13:06 +00:00

backup

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

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

core

am b0dfaad8: am f99551d8: am c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev

2015-02-12 07:51:11 +00:00

devicepolicy

Merge "Avoid NullPointerException in enableSystemApp if the app is absent."

2015-02-11 17:05:19 +00:00

java/com/android/server

Move AudioService to services.

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

print

Increase bind remote print spooler timeout for eng builds.

2014-10-07 22:40:28 +00:00

restrictions

…

tests

Remove deprecated version of setProfileOwner that takes packageName

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

usage

UsageStatsService: Update file index to prevent double checkin

2014-11-07 17:36:27 -08:00

usb

Move AudioService to services.

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

voiceinteraction

Bring back voice interaction APIs.

2015-01-21 15:07:20 -08:00

Android.mk

resolved conflicts for merge of 4cbee7d2 to lmp-dev-plus-aosp

2014-09-20 11:28:22 -07:00