Fabrice Di Meglio 5412ba1cb9 resolved conflicts for merge of 8794c80d to master ...

Change-Id: I61313a3dd4cd0bcbf04c16dc17996a997b43fe0c

2012-11-30 17:08:26 -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 ed8c323a: am 38e84700: Merge "Fix issue #7585876: When changing the font settings, the movie..." into jb-mr1.1-dev

2012-11-29 14:28:24 -08:00

appwidget

am 224daede: am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev

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

bluetooth

am de95a276: am 3fe63ce4: am 652678af: timeout support for accept() and added check for signal size

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

content

am 5007dea9: am bac91ebd: am 860d0cd4: Merge "Cleaner initial boot." into jb-mr1.1-dev

2012-11-29 14:32:49 -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

am 878da653: am 9ed4abd8: Merge "Fix AndroidHttpClient documentation error."

2012-11-29 10:24:14 -08:00

nfc

…

os

am ca4199ef: am 04f3b12f: am 5ea914f2: am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev

2012-11-30 15:52:25 -08:00

preference

Expose PreferenceManager constructor / Preference#performClick

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

provider

am 9e129f37: am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev

2012-11-30 13:22:03 -08:00

security

Switch keystore to binder

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

server

am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev

2012-11-29 14:25:40 -08:00

service

am 33a8b28f: am 1cc041f7: am 7538ff09: am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev

2012-11-28 11:04:18 -08:00

speech

Make TTS input string limit public and documented.

2012-11-27 03:25:27 -08:00

test

…

text

Add support for face attribute to HTML string resources

2012-11-27 14:34:33 -08:00

util

am 84ea428d: am ed8c323a: am 38e84700: Merge "Fix issue #7585876: When changing the font settings, the movie..." into jb-mr1.1-dev

2012-11-29 14:33:44 -08:00

view

resolved conflicts for merge of 8794c80d to master

2012-11-30 17:08:26 -08:00

webkit

Fix broken more JavaDoc links

2012-11-30 16:32:17 -08:00

widget

am cd91470a: am 146b1290: am cdc6d5cf: Merge "Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev

2012-11-29 14:33:10 -08:00

package.html

…