Nick Kralevich 061155eb6e am 8f067ca1: resolved conflicts for merge of 4cbee7d2 to lmp-mr1-dev-plus-aosp ...

* commit '8f067ca18d333bf03b7dc8a60c2b66b1faf0e5ac':
  Remove MALLOC_LEAK_CHECK references.

2014-09-20 20:04:44 +00:00

..

accessibility

TouchExploer computes incorectly the click location.

2014-09-19 16:54:20 -07:00

appwidget

Merge "AppWidgetServiceImpl: Use enforceCallingOrSelfPermission for checking DUMP" into lmp-dev

2014-09-04 23:36:00 +00:00

backup

Track enable/disable of transport components

2014-09-12 22:01:12 +00:00

core

am 86fdd3cf: am 77e786ab: am 978272f4: am a94c9ccb: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev

2014-09-20 02:59:33 +00:00

devicepolicy

Merge "Allow primary user profile owner to set device restrictions" into lmp-dev

2014-09-19 15:51:39 +00:00

java/com/android/server

am 523afd15: Merge "Frameworks/base: Add native bridge post-fork initialization"

2014-09-04 21:55:34 +00:00

print

Handle user changes off the main thread.

2014-09-04 18:57:05 -07:00

restrictions

Rename getLocalApprovalIntent to createLocalApprovalIntent

2014-09-05 10:51:13 -07:00

tests

am ad0a66ac: am c1ce74ca: Merge "Revert "SELinuxMMAC unit tests""

2014-09-03 20:20:34 +00:00

usage

Merge "UsageStats should deal with changing time" into lmp-dev

2014-09-12 01:42:21 +00:00

usb

Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager

2014-08-29 17:29:27 -07:00

voiceinteraction

Fix issues with multiple languages and multi-users

2014-09-15 19:59:09 -07:00

Android.mk

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

2014-09-20 11:15:50 -07:00