Michael Wright 244f776855 resolve merge conflicts of f013c3f111 to master. ...

Change-Id: I2045187f8fa948a1733cb9a2cdc0a69ae97b5907

2015-10-20 23:48:55 +01:00

..

accessibilityservice

…

accounts

Added --restricted option for create-user command

2015-09-28 10:01:54 -07:00

animation

Change wrong doc about using linear interpolator.

2015-10-16 10:47:57 -07:00

annotation

…

app

Merge "Retain fragment loaders" into mnc-dr-dev am: ad968cf4e5 am: 6320767fb1 am: 02940eb47f

2015-10-20 21:38:55 +00:00

appwidget

…

bluetooth

Merge "Fix wrong javadoc in BluetoothAdapter."

2015-08-20 09:29:29 +00:00

content

Merge "Enable "quick install""

2015-10-20 21:25:24 +00:00

database

…

ddm

Remove GLTrace support

2015-10-06 15:18:40 -07:00

debug

…

gesture

…

hardware

resolve merge conflicts of f013c3f111 to master.

2015-10-20 23:48:55 +01:00

inputmethodservice

Handle BadTokenException exception more reliably.

2015-09-14 16:48:15 -07:00

net

Incorrect time used in some NTP server responses

2015-10-17 03:36:32 +09:00

nfc

Fix missing copyright headers.

2015-09-07 11:53:59 +02:00

os

Merge "Initial implementation of light-weight idle mode."

2015-10-20 17:51:34 +00:00

preference

am 3afdd417: am cad75a26: am 627bc805: am ae5a53d7: Merge "Update volume slider on device changed." into mnc-dr-dev

2015-10-15 14:05:16 +00:00

print

…

printservice

…

provider

Merge "Add BLOCKED and REJECTED call types."

2015-10-02 20:37:47 +00:00

security

Allow uid to be passed for more operations

2015-09-10 15:34:11 -07:00

service

resolved conflicts for 429e7dcd to master

2015-10-16 16:25:40 -04:00

speech

…

test

Suppress testAndroidTestCaseSetupProperly

2015-10-05 13:25:03 -07:00

text

am ebdf60e7: am 0221328c: am b3538082: am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev

2015-10-16 22:20:01 +00:00

transition

Set the bounds on the drawable for ChangeBounds reparenting.

2015-10-19 13:50:16 -07:00

util

Animate radial time picker selector during hour/minute transition

2015-10-02 15:29:43 -04:00

view

Merge "Do not update pointer icon shape for HOVER_EXIT event."

2015-10-20 19:54:47 +00:00

webkit

Merge "Format the Javadoc using <p>"

2015-10-08 22:23:03 +00:00

widget

Rename DisplayListData to DisplayList

2015-10-16 10:38:34 -07:00

package.html

…