Ben Kwa cf1e2f03df resolved conflicts for merge of 3aff4fc6 to master ...

Change-Id: Id816d859f929de3bd0328ef3a67e2bef9fadf28b

2015-06-10 18:22:10 -07:00

..

accessibilityservice

…

accounts

System Health: Support expiring tokens

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

animation

Merge "Clarify docs for Animator.isStarted()" into mnc-dev

2015-06-10 14:27:47 +00:00

annotation

…

app

am 60022334: am a1e60f1f: Merge "Use who when requesting permissions" into mnc-dev

2015-06-10 01:54:27 +00:00

appwidget

…

bluetooth

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

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

content

Merge "Add more result extras for ACTION_GET_PERMISSIONS_COUNT" into mnc-dev

2015-06-10 16:38:55 +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

…

debug

…

emoji

…

gesture

…

hardware

Merge "Camera2: Clarify capture order for reprocess" into mnc-dev

2015-06-10 17:51:18 +00: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

am e95f4bf1: am 3f2fbf7e: am 2c936af8: Merge "Frameworks/base: Add is64Bit method to Process" into mnc-dev

2015-06-09 18:58:49 +00:00

preference

Ringtone picker is not affected by current sonification policy

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

print

…

printservice

…

provider

resolved conflicts for merge of 3aff4fc6 to master

2015-06-10 18:22:10 -07:00

security

Add optional additional entropy to finish

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

service

Merge "Null check when reconstituting legacy icon data." into mnc-dev

2015-06-10 18:03:02 +00: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

am f0a79ac9: am 0d8f5352: am 767ec843: Merge "Set the right reportNextDraw" into mnc-dev

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

webkit

Deprecate WebView scrollbar overlay API

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

widget

am 0dd41507: am dc904377: am 89124000: Merge "Fix Floating tool bar flickers after long pressing on empty region." into mnc-dev

2015-06-10 17:26:20 +00:00

package.html

…