Elliott Hughes 2a805f9304 resolved conflicts for merge of 368d81fe to master ...

Change-Id: I4bc59cd9a54cbc1b62ac135cf86dc73ac85968d5

2013-07-31 18:25:47 -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

Optimize calls to Trace for animators

2013-06-04 09:37:38 -07:00

annotation

…

app

am bd61ba5b: am a99cb5bc: (DO NOT MERGE) Fix pub issue #58043: Copy crash in Android 4.3...

2013-07-31 14:18:06 -07: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

Merge "Add debug menu to enable btsnoop"

2013-07-26 18:33:43 +00:00

content

am 46aae98b: am f2d643cf: Merge "Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter."

2013-07-30 15:34:26 -07:00

database

am dcb8d876: am 79df1e65: am e2a281ca: Merge "Add additional Method that check whether a table is empty or not"

2013-05-28 13:51:01 -07:00

ddm

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

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

debug

…

emoji

…

gesture

…

hardware

Camera2 API: Fix missing callback issue

2013-07-31 12:02:07 -07:00

inputmethodservice

Fix possible NPE in IInputMethodWrapper

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

net

Fix excessive log spew.

2013-07-31 15:49:04 -07:00

nfc

Change XML-grammar for (Off)HostApduServices.

2013-07-25 17:43:47 -07:00

os

resolved conflicts for merge of 368d81fe to master

2013-07-31 18:25:47 -07:00

preference

Merge "Fix handling of ListPreference.setValue()"

2013-07-23 22:16:56 +00:00

print

Iteration on the print sub-system.

2013-07-30 17:15:11 -07:00

printservice

Iteration on the print sub-system.

2013-07-30 17:15:11 -07:00

provider

Merge "Define storage roots, external GUIDs, creation."

2013-07-31 06:00:35 +00:00

security

keystore: Add flag for blobs to be unencrypted

2013-04-15 11:09:29 -07:00

service

StatusBarNotification cleanup.

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

speech

Document the case where TTS onInit callback is called in ctor.

2013-06-20 08:58:41 +00:00

test

…

text

resolved conflicts for merge of a35ec14f to master

2013-07-25 10:36:59 -07:00

util

Fix issue #10115327: MapCollections need to implement equals

2013-07-31 17:52:07 -07:00

view

Merge "Fix lazy measure logic to not use obsolete values"

2013-07-26 00:27:50 +00:00

webkit

Merge "Revert "Flag-flip: set chromium to be the default WebView""

2013-07-31 11:46:36 +00:00

widget

Merge "Don't show spinner popup if adapter is null"

2013-07-30 18:04:18 +00:00

package.html

…