Andrei Stingaceanu a6a63328b0 resolved conflicts for merge of 1c96a941 to mnc-vt-dev ...

Change-Id: I054ad8a72daa609138954909619ef6270062baaf

2015-06-11 12:08:49 +01:00

..

accessibilityservice

…

accounts

System Health: Support expiring tokens

2015-06-02 09:58:18 -07:00

animation

Infer value type for ObjectAnimator, too

2015-06-08 14:42:13 -07:00

annotation

Merge "Add @RequiresPermission"

2015-04-23 18:36:33 +00:00

app

Merge "Use who when requesting permissions" into mnc-dev

2015-06-10 01:29:21 +00:00

appwidget

Exclude bound app widgets from idle app list

2015-05-01 11:17:27 -07:00

bluetooth

SAP: Make it possible to enforce a 16-digit pin code (4/5)

2015-06-09 21:42:22 +00:00

content

Merge "Flags to select storage volume for app installs." into mnc-dev

2015-06-10 04:43:18 +00:00

database

am eb4bd19e: Terminate loop properly when cursor window is full. DO NOT MERGE

2015-06-02 03:33:31 +00:00

ddm

Improve hierarchy viewer dump hierarchy latency

2015-05-07 18:44:15 -07:00

debug

…

emoji

…

gesture

…

hardware

Add documentation for possible AndroidKeyStore exceptions to authenticate() call

2015-06-09 15:26:43 -07:00

inputmethodservice

Completely remove ExtractActionMode from ExtractEditLayout

2015-06-09 10:50:48 +01:00

net

Make public Network#bindSocket(FileDescriptor).

2015-06-09 16:19:24 +09:00

nfc

Merge "Make peer LLCP version an int." into mnc-dev

2015-06-10 06:58:20 +00:00

os

Merge "Frameworks/base: Add is64Bit method to Process" into mnc-dev

2015-06-09 18:20:00 +00:00

preference

Ringtone picker is not affected by current sonification policy

2015-05-21 11:52:41 -07:00

print

…

printservice

…

provider

am 12149b69: Merge "Add setting for assistant" into mnc-dev

2015-06-09 22:13:28 +00:00

security

Add optional additional entropy to finish

2015-06-04 10:06:00 -07:00

service

Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId

2015-06-08 14:59:09 -07:00

speech

Add getCallingUid() to RecognitionService.Callback.

2015-05-27 09:51:19 -07:00

test

…

text

Merge "Prevent poorly-extended ParcelableSpans from writing to parcels" into mnc-dev

2015-06-04 16:55:57 +00:00

transition

Merge "API Council changes." into mnc-dev

2015-06-08 16:36:22 +00:00

util

Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev

2015-06-10 00:25:32 +00:00

view

Merge "Dont ignore layer paint alpha in software path" into mnc-dev

2015-06-09 22:23:36 +00:00

webkit

Deprecate WebView scrollbar overlay API

2015-06-09 11:48:01 -07:00

widget

Fixed a RTL layouting bug with LinearLayout

2015-06-09 18:33:19 +00:00

package.html

…