Nick Kralevich 7668e78601 resolved conflicts for merge of 3bae94d7 to master ...

Change-Id: I381539b1494447d62290c492f2550840fe0b559c

2014-12-10 11:03:40 -08:00

..

accessibility

am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched.

2014-12-08 19:12:22 +00:00

appwidget

…

backup

Correctly parse previous PMBA state during backup

2014-12-04 19:38:55 -08:00

core

resolved conflicts for merge of 3bae94d7 to master

2014-12-10 11:03:40 -08:00

devicepolicy

am d483a85e: am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev

2014-12-09 00:18:21 +00:00

java/com/android/server

am 02775fca: am 8dd185b0: am 5d2c1e69: (Telecom-system part 3) Adding Telecom Loader Service

2014-12-09 23:20:31 +00:00

print

…

restrictions

…

tests

Offer to "merge" subscribers for data usage.

2014-12-08 08:42:59 -08:00

usage

…

usb

am 32ed193b: am f5e44c29: am c5c93edd: Merge "When switching to default USB function set, check restriction" into lmp-mr1-dev

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

voiceinteraction

Issue #17551667: Voice interaction service should be disabled...

2014-11-14 11:05:08 -08:00

Android.mk

…