Fabrice Di Meglio da391700c9 resolved conflicts for merge of e549a602 to master ...

Change-Id: I37dc0e48321d4baea49d77b6ef22bca19dcb0d9b

2012-10-19 12:49:30 -07:00

..

accessibilityservice

Adding a global accessibility action to open quick settings.

2012-09-25 16:07:59 -07:00

accounts

am 9fb2695c: am 628025fd: am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev

2012-10-18 00:12:35 -07:00

animation

…

annotation

…

app

am 2f296598: am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev

2012-10-18 12:21:28 -07:00

appwidget

Letting partial update fall through if the widget has not received a full update yet. (Bug 7214731)

2012-10-11 14:27:03 -07:00

bluetooth

Add serial port profile support and allow to connect to rfcomm channel without sdp discovery

2012-10-15 22:30:29 -07:00

content

Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev

2012-10-18 21:02:13 -07:00

database

Use myUserId() only in registerContentObserver()

2012-10-03 17:41:51 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Camera: Query AudioService for shutter sound enforcement.

2012-10-08 23:53:48 -07:00

inputmethodservice

Migrate more System and Secure settings to Global.

2012-10-02 13:55:15 -07:00

net

Add icon for mobile notification

2012-10-02 16:50:29 -07:00

nfc

NfcAdapterExtras: expose driver name.

2012-10-03 14:14:23 -07:00

os

Fix javadoc

2012-10-17 11:06:11 -07:00

preference

No breadcrumbs for single-pane preferences

2012-10-03 16:21:42 -07:00

provider

More on issue #7318666: hide developer options from user build

2012-10-10 18:39:45 -07:00

server

Protect more service dump() methods.

2012-10-15 10:59:51 -07:00

service

Frameworks base: Promote dream setting defaults to config.

2012-10-19 11:32:03 -04:00

speech

SynthesisCallback documentation update

2012-10-15 13:07:11 +01:00

test

…

text

am e9d419f5: am 6594eca0: am 9704b563: Merge "Fix for 7301594 Html.toHtml creating potentially invalid html" into jb-mr1-dev

2012-10-08 12:47:56 -07:00

util

…

view

resolved conflicts for merge of e549a602 to master

2012-10-19 12:49:30 -07:00

webkit

am 935db6c5: am e228b5b9: am 4c38e24a: Merge "Don\'t alter accessibility JS APIs unless a page is about to load." into jb-mr1-dev

2012-10-12 13:55:21 -07:00

widget

resolved conflicts for merge of e549a602 to master

2012-10-19 12:49:30 -07:00

package.html

…