Kenny Root 54645557cb resolved conflicts for merge of 09de4dad to master ...

Change-Id: I4fb41ff1c68f9c6ce38cee9e9fcd11ef7f0f357d

2012-11-14 15:33:18 -08:00

..

accessibilityservice

…

accounts

am cb5cb740: am aecee8a9: am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev

2012-11-08 06:17:59 -08:00

animation

am 768d9e1a: Merge "Correct executable bit for source files"

2012-11-07 11:52:12 -08:00

annotation

…

app

am 27b587b6: am faa38a08: am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs

2012-11-13 14:30:51 -08:00

appwidget

Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEAD

2012-11-08 14:44:35 -08:00

bluetooth

Remove DhcpInfoInternal

2012-11-09 09:46:32 -08:00

content

am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files"

2012-11-07 13:08:25 -08:00

database

am 768d9e1a: Merge "Correct executable bit for source files"

2012-11-07 11:52:12 -08:00

ddm

am 768d9e1a: Merge "Correct executable bit for source files"

2012-11-07 11:52:12 -08:00

debug

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

emoji

…

gesture

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

hardware

am 67a3fb6f: am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev

2012-11-13 10:04:27 -08:00

inputmethodservice

am ae41ba15: am 4424951f: am 1e29e49c: Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev

2012-11-08 15:55:59 -08:00

net

Add method name to curl output

2012-11-14 11:55:33 -08:00

nfc

NfcAdapterExtras: expose driver name.

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

os

am a7113f70: am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev

2012-11-09 22:45:26 -08:00

preference

Expose PreferenceManager constructor / Preference#performClick

2012-10-25 16:27:43 -07:00

provider

am 8920c259: am 259e3121: am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets

2012-11-08 15:32:40 -08:00

security

Switch keystore to binder

2012-11-14 08:45:52 -08:00

server

am 768d9e1a: Merge "Correct executable bit for source files"

2012-11-07 11:52:12 -08:00

service

Frameworks base: Promote dream setting defaults to config.

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

speech

am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files"

2012-11-07 13:08:25 -08:00

test

…

text

am aabe4bb4: am 9c0010f8: am 998d03bd: Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev

2012-11-01 11:45:40 -07:00

util

…

view

am 674db142: am 44643269: Merge "Make tap events less sensitive." into jb-mr1-aah-dev

2012-11-12 10:26:29 -08:00

webkit

am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev

2012-11-08 14:26:39 -08:00

widget

am bb67d486: am a97f5b8c: am 9d82d324: Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev

2012-11-13 11:24:49 -08:00

package.html

…