Michael Wright 99e2308884 am 150e0e87: Merge "fix return value scale of notifyANR()" ...

* commit '150e0e87e1faa01f927cfe8c7110ef843612a1df':
  fix return value scale of notifyANR()

2015-04-15 11:10:58 +00:00

..

accessibility

am bdbd4736: Merge "Refinements to magnification for improved wearable support." into lmp-mr1-modular-dev

2015-02-19 01:06:51 +00:00

appwidget

…

backup

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

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

core

am 150e0e87: Merge "fix return value scale of notifyANR()"

2015-04-15 11:10:58 +00:00

devicepolicy

Fix NPE if FPE service does not exist.

2015-03-25 11:43:42 +00:00

java/com/android/server

am 7c08dd61: Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev

2015-03-23 20:21:58 +00:00

print

…

restrictions

…

tests

Remove dead code, mostly DataStateTracker.

2015-03-11 10:03:58 -04:00

usage

…

usb

When switching to default USB function set, check restriction

2014-12-05 17:14:43 +00:00

voiceinteraction

…

Android.mk

…