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

…

backup

…

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

…

print

…

restrictions

…

tests

…

usage

…

usb

…

voiceinteraction

…

Android.mk

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

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