Michael Wright 32447718ea am ecc7ca53: resolved conflicts for merge of fa2e53cc to master ...

* commit 'ecc7ca53852a395157ac1b45ee6aa4fe13ade3d1':
  Revert Japanese special case fallback keys.

2014-03-06 10:29:01 -08:00

..

accessibilityservice

…

accounts

Add APIs for obtaining themed Drawable from Theme, Context

2014-02-03 18:42:24 -08:00

animation

AArch64: Use of long for pointers in PropertyValuesHolder

2014-01-29 11:07:06 +00:00

annotation

Hide NonNull and Nullable.

2013-12-17 08:44:38 -08:00

app

Manually merge commit '2faf28cf' into master

2014-03-04 15:25:43 -08:00

appwidget

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

bluetooth

am 1ece04f3: Merge "BluetoothInputJava: Add broadcast action REPORT" into klp-modular-dev

2014-01-28 20:44:25 +00:00

content

am 388eece1: am d708b2f1: am e3a6a7b4: am 841aa8db: am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter.

2014-03-03 17:39:44 +00:00

database

am df8b604e: Merge "Fix NPE in deleteDatabase()." into klp-modular-dev

2014-01-28 00:13:27 +00:00

ddm

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05: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

…

hardware

Camera2: make shading.mode key public

2014-03-04 21:23:34 +00:00

inputmethodservice

Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD

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

net

am bf588bda: am f08cd8c6: am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes"

2014-03-04 23:51:51 +00:00

nfc

Merge "Tabs -> spaces in frameworks/base."

2014-02-25 19:57:33 +00:00

os

Merge "Detect invalid uses of Message."

2014-03-04 00:05:25 +00:00

preference

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

print

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

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

printservice

…

provider

am 48d04ec3: Merge "Add IN_DEFAULT_DIRECTORY to contract"

2014-03-05 09:41:17 -08:00

security

…

service

Manually merge commit '2faf28cf' into master

2014-03-04 15:25:43 -08:00

speech

Add public SynthesisRequestV2 constructor.

2014-01-30 13:27:00 +00:00

test

…

text

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

transition

Change Activity Scene Transitions to be more automatic redo.

2014-02-26 15:30:22 -08:00

util

Make LruCache.resize(int) public

2014-02-20 10:27:55 +00:00

view

resolved conflicts for merge of fa2e53cc to master

2014-03-05 18:46:22 -08:00

webkit

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

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

widget

am 71c3a3d9: am 6c3a45d7: am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev

2014-03-06 00:42:36 +00:00

package.html

…