Jeff Brown ba6b897816 resolved conflicts for merge of 825dd9dd to klp-dev-plus-aosp ...

.
Change-Id: I2363c40f641e7e60487354e1710312db2cbbc89a

2014-03-13 21:10:40 -07:00

..

accessibilityservice

Add importantForAccessibility mode to block entire hierarchy

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

accounts

…

animation

AArch64: Use of long for pointers in PropertyValuesHolder

2014-01-29 10:47:27 +00:00

annotation

…

app

resolved conflicts for merge of 825dd9dd to klp-dev-plus-aosp

2014-03-13 21:10:40 -07:00

appwidget

…

bluetooth

am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev

2014-03-08 02:05:57 +00:00

content

am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation"

2014-03-13 01:54:56 +00:00

database

AArch64: Use long for pointers

2014-01-08 11:53:21 +00:00

ddm

Change IsMethodTracingActive to GetMethodTracingMode for frameworks.

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

debug

Remove unused JNITest class

2014-02-21 14:34:35 +00:00

emoji

Use long for pointers in EmojiFactory and PdfDocument

2014-01-31 12:03:28 +00:00

gesture

Fix hardware layers lifecycle

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

hardware

am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter"

2014-03-13 01:54:47 +00:00

inputmethodservice

Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD

2013-11-22 11:18:57 -08:00

net

am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev

2014-03-12 23:21:02 +00:00

nfc

NFC: getNdefMessage() should throw exception if no tag in field.

2014-01-28 15:20:30 +01:00

os

am 9e413bf4: am bbfc08b3: Merge changes I6d4fdada,Ia34899a4

2014-03-10 18:04:47 +00:00

preference

Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev

2013-11-21 20:12:13 +00:00

print

Avoid NPE and add a warning log if a printing app misbehaves.

2013-11-13 17:31:15 -08:00

printservice

Complete implementation of the advanced print options.

2013-10-28 11:44:07 -07:00

provider

am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev

2014-03-03 21:58:47 +00:00

security

Add argument to binder call to check key types

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

service

StatusBarNotification cleanup.

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

speech

AArch64: Use long for pointers in speech/srec classes

2014-01-15 17:38:06 -08:00

test

…

text

am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs

2013-12-17 16:44:31 -08:00

transition

Merge "Fix leak in TransitionInflater" into klp-dev

2013-10-31 21:38:21 +00:00

util

am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement."

2014-03-13 01:55:20 +00:00

view

am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev

2014-03-14 00:40:11 +00:00

webkit

DO NOT MERGE: Fix build after checkThread fix merge to master

2014-03-03 18:48:00 +00:00

widget

am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar"

2014-03-13 01:54:59 +00:00

package.html

…