Rubin Xu 3ba5331a83 resolve merge conflicts of 4daa1b7 to master ...

Change-Id: I5292c074234fccc26c7a843f56eb68edce26d678

2016-09-15 10:42:50 +01:00

..

accessibility

Change users without crashing a11y services.

2016-09-14 19:21:20 +00:00

appwidget

Fixing typo in dump log. am: b43ba86811 am: 1de1a3bfcc

2016-08-30 01:20:12 +00:00

backup

…

core

resolve merge conflicts of 4daa1b7 to master

2016-09-15 10:42:50 +01:00

devicepolicy

Merge "Fingerprint Strong auth timeout"

2016-09-15 07:46:07 +00:00

java/com/android/server

resolve merge conflicts of 15de376 to master

2016-09-12 21:12:49 -07:00

midi

…

net

ApfFilter: take into account IPv4 subnet prefix

2016-09-13 10:54:47 +09:00

print

Hold no locks when calling RemotePrintSpooler

2016-08-29 21:29:34 +00:00

restrictions

…

retaildemo

…

tests

Merge "Support for specifying orientation in WindowContainer"

2016-09-14 21:21:21 +00:00

usage

…

usb

Allow connection from secondary profiles

2016-09-08 10:59:18 -07:00

voiceinteraction

…

Android.mk

…