Fabrice Di Meglio e94aceabdb resolved conflicts for merge of 71de1312 to master ...

Change-Id: Ib2065147a3160b5176fd44a4d14bec06c7c973e1

2013-08-27 12:56:20 -07:00

..

accessibilityservice

add attributes to accessibility service info

2013-06-06 18:37:59 -07:00

accounts

am 8811154e: am 423f8a8c: am 2618ac55: am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager

2013-06-03 14:34:00 -07:00

animation

Fix typo in JavaDoc for TypeEvaluator.

2013-08-15 19:37:32 -07:00

annotation

…

app

Merge "Improve transient bar transitions." into klp-dev

2013-08-21 13:36:36 +00:00

appwidget

am 18748035: am 379517b0: Merge "Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)" into jb-mr2-dev

2013-06-05 11:50:47 -07:00

bluetooth

Fix the build.

2013-08-27 12:39:40 +01:00

content

Fix docs build.

2013-08-23 22:20:03 -07:00

database

Docs changes pursuant to API review feedback.

2013-08-23 17:44:47 -07:00

ddm

Replace native Process getpid/getuid with calls to libcore equivalents.

2013-07-31 17:19:23 -07:00

debug

…

emoji

…

gesture

Fix hardware layers lifecycle

2013-08-16 18:38:29 -07:00

hardware

Merge "Camera2: Add CameraDevice#flush()" into klp-dev

2013-08-27 16:49:04 +00:00

inputmethodservice

Fix possible NPE in IInputMethodWrapper

2013-07-01 19:19:31 +09:00

net

Increase sampling data size limits

2013-08-26 15:11:01 -07:00

nfc

NFC: Allow HostApduService to indicate transaction unhandled.

2013-08-19 11:52:27 -07:00

os

am e0612ffe: am 826debf5: Merge "Print UI bug fixing and printer discovery refactoring." into klp-dev

2013-08-26 15:10:49 -07:00

preference

Merge "Allow recycling of Preferences in com.android.* packages" into klp-dev

2013-08-21 01:58:55 +00:00

print

Print UI bug fixing and printer discovery refactoring.

2013-08-23 18:36:33 +00:00

printservice

Fix build

2013-08-20 16:40:57 -07:00

provider

Remove or reduce visibility of deprecated methods

2013-08-27 10:53:15 -07:00

security

…

service

StatusBarNotification cleanup.

2013-07-26 10:42:56 -04:00

speech

Touch up the Hotword API

2013-08-26 18:01:34 -07:00

test

…

text

Fix NPE in DateFormat.is24HourFormat.

2013-08-16 14:53:26 -07:00

util

am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."

2013-08-02 17:58:33 -07:00

view

Merge "Update AccessibilityNodeInfo API as per API council request" into klp-dev

2013-08-27 18:14:01 +00:00

webkit

am 4a079d44: am 39c9c632: Merge "Reset the Experimental WebView property per build" into klp-dev

2013-08-21 22:07:49 -07:00

widget

resolved conflicts for merge of 71de1312 to master

2013-08-27 12:56:20 -07:00

package.html

…