Jose Lima a5b61d39ce am 92703e62: resolved conflicts for merge of 4882ddfa to master ...

* commit '92703e62c1dc88a410a32b05c2d44f391c193140':
  Add banner attribute to app manifest

2014-03-13 21:30:03 -07: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

resolved conflicts for merge of 4882ddfa to master

2014-03-13 21:26:48 -07:00

appwidget

Tabs -> spaces in frameworks/base.

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

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

resolved conflicts for merge of 4882ddfa to master

2014-03-13 21:26:48 -07:00

database

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

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

ddm

…

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

Merge "camera3: Pass vendor tags through binder."

2014-03-13 20:18:37 +00:00

inputmethodservice

…

net

Merge "EthernetDataTracker: Return proper interface name"

2014-03-13 12:07:36 +00:00

nfc

am 4d328a79: am a43f7cb0: am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field."

2014-03-06 16:21:46 +00:00

os

am 2fcac8ba: am b41c951f: am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs

2014-03-12 15:19:23 +00:00

preference

Tabs -> spaces in frameworks/base.

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

print

…

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

Fix problem with Animators pausing the wrong Window.

2014-03-06 14:36:28 -08:00

util

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

2014-03-11 12:11:39 +00:00

view

App compat

2014-03-13 14:53:13 -07:00

webkit

Switch WebView to onDetachedFromWindowInternal

2014-03-06 15:54:54 -08:00

widget

am cf2b65ce: am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev

2014-03-13 18:02:17 +00:00

package.html

…