Jeff Sharkey 596e8588b1 resolve merge conflicts of d1153a3 to master ...

Change-Id: Iec9a4a76d0db0fbebdca8a732b4666cfaad70267

2016-04-25 16:40:38 -06:00

..

accessibilityservice

…

accounts

…

animation

Merge "Fix pause/resume for AnimatorSet" into nyc-dev

2016-04-19 22:14:37 +00:00

annotation

…

app

resolve merge conflicts of d1153a3 to master

2016-04-25 16:40:38 -06:00

appwidget

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

bluetooth

OobData documentation

2016-04-19 17:36:12 +00:00

content

Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev am: 0c9c09c am: b3e7163

2016-04-25 10:29:00 +00:00

database

…

ddm

…

debug

…

gesture

…

hardware

Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev

2016-04-21 17:11:55 +00:00

inputmethodservice

…

net

resolve merge conflicts of d1153a3 to master

2016-04-25 16:40:38 -06:00

nfc

frameworks/base: Avoid Long object allocations in Long.valueOf()

2016-04-22 13:36:53 +01:00

os

Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev am: 3cabb2a am: 6c0291c

2016-04-25 21:50:55 +00:00

permissionpresenterservice

Cleanup of the PackageInstaller API - Frameworks

2016-04-22 14:18:32 -07:00

preference

…

print

Rename 'thousands of an inch' to 'thousandths of an inch'in the docs.

2016-04-21 16:29:43 -07:00

printservice

Print API for N: Fix docs and change interfaces as requested.

2016-04-20 13:42:18 -07:00

provider

resolve merge conflicts of 59ad404 to nyc-mr1-dev-plus-aosp

2016-04-25 15:52:11 -06:00

security

…

service

Avoid instantiations of Boolean that are immediately unboxed.

2016-04-25 10:47:02 +01:00

speech

…

test

…

text

Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev

2016-04-20 18:35:57 +00:00

transition

…

util

…

view

Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev am: f48f390 am: dea459c

2016-04-25 09:49:27 +00:00

webkit

Merge "WebView doc: explain persist js across navigations" into nyc-dev

2016-04-25 18:39:47 +00:00

widget

Merge "Fix unexpected truncation again." into nyc-dev am: ab8913e am: 33ed899

2016-04-25 03:52:15 +00:00

package.html

…