Kristian Monsen 1456758802 resolved conflicts for merge of 58a1ca66 to master-chromium ...

Change-Id: I06b61e6d7d52b584eae03a95220381475b8bff0e

2013-02-14 19:48:27 -08:00

..

accessibilityservice

Adding new APIs to UiAutomation.

2013-02-11 19:59:45 -08:00

accounts

Move lingering services to services.jar.

2012-12-11 09:50:50 -08:00

animation

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

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

annotation

…

app

split Surface in two classes: SurfaceControl and Surface

2013-02-14 12:19:11 -08:00

appwidget

am 5b56d432: am 9107fa5d: am 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev

2013-01-08 12:52:38 -08:00

bluetooth

am 3b5c4382: am b8e80eb5: am 4fd38e8d: Merge "Clean up debug messages" into jb-mr1.1-dev

2012-12-03 11:30:56 -08:00

content

Merge "Fix issue #8176917: Stabillity : Native Crash :"

2013-02-12 00:44:26 +00:00

database

am 4fd60792: am 5262a108: Merge "Complete documentation of whereArgs (Issue #43061)"

2013-02-08 17:03:42 -08:00

ddm

Support invoking view methods from hierarchy viewer

2013-01-22 17:25:46 -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

Merge "rework SystemSensorManager.java"

2013-02-06 23:32:42 +00:00

inputmethodservice

resolved conflicts for merge of ebcbfb3f to master

2012-12-10 16:50:22 -08:00

net

Adjust captive portal test for setup wizard

2013-02-14 11:02:10 -08:00

nfc

Merge "Make NfcAdapter states public and fix build."

2013-01-09 12:28:44 -08:00

os

Merge "Starting point for User Restrictions API"

2013-02-11 23:17:07 +00:00

preference

Fix issue #6595555: deal better with fragmentless headers.

2013-02-12 11:42:51 -08:00

provider

Merge "Reset SensorEventListener when listener reenabled."

2013-02-11 17:47:14 +00:00

security

Track keystore binder changes

2013-02-13 15:22:25 -08:00

service

am 81f82d29: am aa8dc2ee: Removed mCallbackLooper from WallpaperService

2012-12-10 19:50:11 -08:00

speech

Deprecate unused and implementation-specific parts of TTS API

2013-01-30 09:37:05 +00:00

test

…

text

Merge "Clean Paint.mBidiFlags as it is no longer used"

2013-02-13 19:11:50 +00:00

util

Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!

2013-02-12 15:41:49 -08:00

view

resolved conflicts for merge of 58a1ca66 to master-chromium

2013-02-14 19:48:27 -08:00

webkit

Merge "Handle WebKit selection changes synchronously."

2013-02-05 21:47:22 +00:00

widget

Merge "Revert "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE"""

2013-02-13 22:23:45 +00:00

package.html

…