Christopher Tate 44e07e07a1 resolve merge conflicts of 5e380f0 to lmp-mr1-ub-dev ...

Change-Id: Ie8d3c154f4c98bb1c2a1954ff1dabc8f5bc20b71

2016-04-20 11:37:20 -07:00

..

accessibility

…

appwidget

DO NOT MERGE Don't take flags when creating app widget config activity.

2015-06-01 12:55:38 -07:00

backup

…

core

resolve merge conflicts of 5e380f0 to lmp-mr1-ub-dev

2016-04-20 11:37:20 -07:00

devicepolicy

…

java/com/android/server

NPE fix for SyncStorageEngine read authority

2016-02-19 23:38:33 +00:00

print

…

restrictions

…

tests

Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f

2015-11-13 02:03:01 +00:00

usage

…

usb

…

voiceinteraction

Revert "Enable VoiceInteractionService on watch." DO NOT MERGE ANYWHERE

2015-05-21 14:25:05 -07:00

Android.mk

…