Jorim Jaggi 526694ea52 resolve merge conflicts of 3c1b0f0 to master ...

Change-Id: I2314728cba47c28ff580f4dfc69868f8cb5ff5db

2016-08-03 16:23:28 +00:00

..

accessibilityservice

…

accounts

Account Manager Push API

2016-08-02 14:57:06 -07:00

animation

Fix NPE in ValueAnimator am: 543a7ed7af

2016-07-26 15:11:27 +00:00

annotation

…

app

Merge "Revert "Add per-user versions of set{Component,Application}EnabledSetting.""

2016-08-02 23:56:55 +00:00

appwidget

…

bluetooth

Add Bluetooth toggle prompts - framework

2016-07-22 20:40:35 -07:00

content

Merge "Revert "Add per-user versions of set{Component,Application}EnabledSetting.""

2016-08-02 23:56:55 +00:00

database

…

ddm

…

debug

…

gesture

…

hardware

Merge commit \'f8bc27d9683e4089cdfd778dcb61ae67f44665b7\' into manual_merge_f8bc27d

2016-07-20 18:49:43 +00:00

inputmethodservice

…

net

Added todo items for a potential metrics issue am: dc5a63bdd1 am: 94f2fe22b4

2016-07-31 03:48:25 +00:00

nfc

…

os

resolve merge conflicts of 3c1b0f0 to master

2016-08-03 16:23:28 +00:00

permissionpresenterservice

…

preference

Add titles to PreferenceFragments and PreferenceScreens for watches.

2016-07-26 21:11:47 +00:00

print

Fix doc for default print document content type

2016-07-06 17:18:44 -07:00

printservice

…

provider

Set secure setting when all preloaded apps are installed

2016-07-29 10:36:06 -07:00

security

…

service

Merge \\"Snooze schedule rules that were canceled by alarms.\\" into nyc-mr1-dev am: ae0aed951b

2016-07-20 20:51:12 +00:00

speech

…

test

…

text

Enforce consistent sizes for arrays in SpannableStringInternal

2016-07-25 18:19:00 +00:00

transition

…

util

Merge "indexOfValue now uses .equals (cont.)"

2016-07-18 20:02:11 +00:00

view

Fix FrameMetricsObserver crash am: 65ddb154c7 am: 6e30f4c789

2016-08-02 18:32:12 +00:00

webkit

Fix document format

2016-07-27 15:44:54 -07:00

widget

Merge "Document exception throwing in TabHost"

2016-08-03 13:16:08 +00:00

package.html

…