Alan Viverette 516f953a82 resolved conflicts for merge of e4ccb864 to master ...

Change-Id: I50c41c712c4eb4f68b22777efb2e5d5370536b22

2013-10-07 18:05:09 -07:00

..

accessibilityservice

Add importantForAccessibility mode to block entire hierarchy

2013-10-02 17:41:15 -07:00

accounts

…

animation

Set evaluator after setting values so that it can take effect.

2013-09-25 15:50:45 -07:00

annotation

…

app

am 9d1383c6: am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev

2013-10-07 15:16:14 -07:00

appwidget

…

bluetooth

Revert "Allow L2CAP sockets"

2013-10-02 07:56:46 -07:00

content

am 9d1383c6: am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev

2013-10-07 15:16:14 -07:00

database

Rename offer() to add(), remove/hide some APIs.

2013-09-09 17:55:10 -07:00

ddm

Change IsMethodTracingActive to GetMethodTracingMode for frameworks.

2013-08-30 14:40:26 -07:00

debug

…

emoji

…

gesture

Add View constructor that supplies a default style resource

2013-09-09 18:09:13 -07:00

hardware

Merge "camera2: describe non-full hw level optional tag entries" into klp-dev

2013-10-07 23:25:24 +00:00

inputmethodservice

am 4895ec3d: am 940a2ad6: Merge "Don\'t send the same values to onUpdateSelection repeatedly" into klp-dev

2013-09-12 21:57:24 -07:00

net

am 1db7024c: am 2e23484e: am f3f1a370: Merge "Un-deprecate getDhcpInfo" into klp-dev

2013-10-04 13:36:38 -07:00

nfc

Fix crash in ApduServiceInfo parsing.

2013-09-26 11:20:37 -07:00

os

am 8a5f7ab6: am 22c298a5: am 7192c6d7: Merge "KLP/KitKat is now API 19." into klp-dev

2013-10-04 09:11:32 -07:00

preference

am 32a2775e: am 85f77c2b: Merge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-dev

2013-09-24 10:22:50 -07:00

print

The undefined media sizes for both orientations not properly constructed.

2013-10-06 19:44:19 -07:00

printservice

Small print API tweaks

2013-10-04 16:21:12 -07:00

provider

am 6db7f39b: am 1eae6109: am 1b5a2e63: Merge "Don\'t backup/restore ringer mode" into klp-dev

2013-10-07 17:09:04 -07:00

security

Add argument to binder call to check key types

2013-09-10 18:49:40 +00:00

service

…

speech

Catch MissingResourceException caused by bad locale in TTS.

2013-09-25 10:01:27 +00:00

test

…

text

am 280d250c: am 956b23f4: am a0364e23: Merge "Fix infinite recursion in hashcode of Spannables" into klp-dev

2013-10-04 17:36:25 -07:00

transition

Fix resource-loading code for TransitionSet

2013-10-06 12:10:12 -07:00

util

Simplify matrix calculations for display adjustment

2013-10-03 16:46:04 -07:00

view

resolved conflicts for merge of e4ccb864 to master

2013-10-07 18:05:09 -07:00

webkit

am 3bd13f3a: am 6079dbc1: am 050c552f: Fix CookieSyncManager for WebViewClassic

2013-10-04 11:10:48 -07:00

widget

am 266b3026: am 20ba658b: am 31049d76: Use SCREEN Xfermode for keyguard badges; update SeekBar

2013-10-07 17:01:16 -07:00

package.html

…