Lorenzo Colitti 86b5635540 resolve merge conflicts of 51e4acb29d to nyc-dev ...

am: 1142b2654a

* commit '1142b2654ae36b54a61bfe759f2f43a01532ae93':
  Add Connectivity Metrics Logger service

2016-02-24 06:37:35 +00:00

..

accessibilityservice

Update accessibility to be encryption-aware.

2016-02-23 20:15:15 -07:00

accounts

Merge "onAccountsUpdated shouldn\'t be called back after listener unregistered"

2016-02-12 17:58:47 +00:00

animation

VectorDrawable native rendering - Step 5 of MANY

2016-02-19 13:51:31 -08:00

annotation

…

app

Merge "Remove deprecated APIs DPM.createUser, createAndInitializeUser" into nyc-dev

2016-02-23 18:01:41 +00:00

appwidget

Using AppWidgetHostView in RemoteViewsAdapter instead of managing the RemoteViews inflation itself

2016-02-17 18:08:46 +00:00

auditing

Log strength of auth method used into security log

2016-02-11 10:36:56 +00:00

bluetooth

Merge commit '26ada7e78993241d702a908eae93d174cbb3c8b3' into HEAD

2016-02-17 11:38:55 -08:00

content

Remove @Nullable annotation from getDrawable() methods

2016-02-23 14:59:51 -05:00

database

…

ddm

…

debug

…

gesture

…

hardware

Make FingerprintManager#hasEnrolledFingerprints per-user

2016-02-23 16:49:58 -08:00

inputmethodservice

…

net

resolve merge conflicts of 51e4acb29d to nyc-dev

2016-02-24 15:19:15 +09:00

nfc

Merge commit '26ada7e78993241d702a908eae93d174cbb3c8b3' into HEAD

2016-02-17 11:38:55 -08:00

os

Merge changes I4e45afed,I2ea19f9a,I922d6f38 into nyc-dev

2016-02-23 21:24:01 +00:00

preference

…

print

Merge "Allow the PDF Printer to "print" non-locale-default paper sizes."

2016-02-02 16:34:48 +00:00

printservice

…

provider

Merge "Disable switching users until user 0 is unlocked" into nyc-dev

2016-02-24 00:51:11 +00:00

security

Merge "Use provided context directly" into nyc-dev

2016-02-22 19:11:51 +00:00

service

Add TileService settings API

2016-02-19 16:43:00 -05:00

speech

…

test

…

text

JavaDoc for ReplacementSpan getSize & draw functions.

2016-02-19 11:15:09 -08:00

transition

Merge "Fix TransitionSet javadoc to use transitionOrdering attribute." into nyc-dev

2016-02-16 21:38:02 +00:00

util

Frameworks/base: Use Log.printlns in RuntimeInit

2016-02-18 14:01:41 -08:00

view

Merge "Support running AVD on UI thread" into nyc-dev

2016-02-23 22:43:53 +00:00

webkit

Using addAssetPathAsSharedLibrary in WebViewDelegate

2016-02-23 09:01:28 -08:00

widget

Made the Chronometer able to count downwards

2016-02-22 15:56:56 -08:00

package.html

…