John Reck bf4b31f7b2 resolve merge conflicts of 04ce46db64 to master. ...

Change-Id: I935bb47718f0e7d5fb48945dd8de6e28dac136e5

2015-12-16 11:07:53 -08:00

..

accessibilityservice

Ignore feedbackType in AccessibilityEvent dispatch

2015-11-30 14:36:34 -08:00

accounts

AccountManager: add finishSession(...) API.

2015-12-04 15:32:47 -08:00

animation

VectorDrawable native rendering - Step 2 of MANY

2015-11-18 13:38:23 -08:00

annotation

Fix @code escapes

2015-12-02 14:24:11 +00:00

app

Wire call to suspend a package

2015-12-16 18:14:14 +00:00

appwidget

…

bluetooth

Frameworks/base: Use Arrays.toString

2015-12-14 12:04:26 -08:00

content

Wire call to suspend a package

2015-12-16 18:14:14 +00:00

database

Trace SQLite operations

2015-12-14 12:32:26 -08:00

ddm

…

debug

…

gesture

…

hardware

Make public pointer icon API with custom icons.

2015-12-14 19:45:10 -08:00

inputmethodservice

…

net

Add tagging variants for DatagramSocket.

2015-12-04 15:32:07 -07:00

nfc

Fix @code escapes

2015-12-02 14:24:11 +00:00

os

Merge "Only system can set application restrictions via UserManager"

2015-12-16 10:44:12 +00:00

preference

APIs to obtain SharedPreferences paths.

2015-12-07 19:25:25 -07:00

print

Allow print service to specify progress of print and status

2015-12-01 15:42:49 -08:00

printservice

Allow print service to specify progress of print and status

2015-12-01 15:42:49 -08:00

provider

Merge "Load Home directory by default."

2015-12-14 18:18:02 +00:00

security

Merge "Use the application\'s usesCleartextTraffic flag" am: d16f5f121e

2015-12-14 12:05:20 -08:00

service

Frameworks/base: Fix Notification code

2015-12-11 15:49:07 -08:00

speech

Merge "Fix checks for audio format."

2015-12-09 11:42:36 +00:00

test

…

text

Load Portuguese and German hyphenation in Hyphenator

2015-12-14 21:27:46 +00:00

transition

Fix @code escapes

2015-12-02 14:24:11 +00:00

util

Revert "Fix Build: Revert "Implement locale matching in LocalesList.""

2015-12-08 22:28:30 -08:00

view

resolve merge conflicts of 04ce46db64 to master.

2015-12-16 11:07:53 -08:00

webkit

Add functionality for changing WebView provider.

2015-12-11 14:29:44 +00:00

widget

Merge "Make KEYCODE_SPACE a confirm key."

2015-12-15 16:41:16 +00:00

package.html

…