Elliott Hughes b8292830f7 resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp ...

Change-Id: I3349f8d2e6715171e2677c1385122ceb2810c1f6

2013-06-28 16:50:13 -07:00

..

accessibilityservice

add attributes to accessibility service info

2013-06-06 18:37:59 -07:00

accounts

am 2618ac55: am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager

2013-06-03 14:27:50 -07:00

animation

…

annotation

…

app

am a9221987: Merge "Save Notification large icon to extras." into jb-mr2-dev

2013-06-11 14:09:53 -07:00

appwidget

Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)

2013-06-04 14:25:28 -07:00

bluetooth

Doc change: new Bluetooth LE doc

2013-06-21 14:52:05 -07:00

content

am 8ebfb8c9: am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs

2013-06-01 08:35:13 -07:00

database

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

2013-05-28 12:57:59 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

revise docs for new sensor types. fix markup error causing tons of code font

2013-06-13 16:37:51 -07:00

inputmethodservice

am 1a546dca: Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar."

2013-04-18 15:28:18 -07:00

net

resolved conflicts for merge of fca0f92e to stage-aosp-master

2013-06-28 16:41:19 -07:00

nfc

resolved conflicts for merge of fca0f92e to stage-aosp-master

2013-06-28 16:41:19 -07:00

os

Merge "Filter out dangerous CharSequences in Notification." into jb-mr2-dev

2013-05-09 00:28:11 +00:00

preference

am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"

2013-05-26 00:02:46 -07:00

provider

Unhide action to launch Daydream settings.

2013-05-29 22:28:22 -04:00

security

…

service

fix javadoc links.

2013-05-22 19:00:09 -07:00

speech

Fix for TTS.setLanguage throwing MissingResourceException

2013-05-08 15:56:12 +01:00

test

…

text

am 94ba190e: am de04dfb6: Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev

2013-06-17 22:13:17 -07:00

util

am 0bb497b8: Merge "Use the newer ZoneInfoDB API."

2013-04-26 12:38:04 -07:00

view

am 93d46952: am 67603c6e: Recreate TextureView\'s display list on attach Bug #9425270

2013-06-27 14:52:33 -07:00

webkit

am 12c4c0e4: Merge "Fix deadlock of WebViewCoreThread"

2013-06-25 15:31:39 -07:00

widget

am 34bc73df: Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev

2013-06-12 21:11:12 -07:00

package.html

…