Man Cao 80bea9cde1 resolved conflicts for merge of 8fb82074 to master ...

Change-Id: I27c7ddeead5a589ae8824f87bf6b42998dc081eb

2015-06-24 17:28:01 -07:00

..

accessibilityservice

…

accounts

[Modify LastAuthenticatedTimestamp behaviour]:

2015-06-19 17:12:38 -07:00

animation

DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes

2015-06-10 22:54:09 +00:00

annotation

…

app

resolved conflicts for merge of 8fb82074 to master

2015-06-24 17:28:01 -07:00

appwidget

AppWidgetServiceImpl should use ParceledListSlice as return object

2015-06-17 15:23:31 -07:00

bluetooth

Bluetooth energy: fix overflow in calculation

2015-06-15 17:19:07 -07:00

content

am 425bd876: am d1741ef9: am 1af5fe23: Merge "Require that verified intent filters only have http/https <data> decls" into mnc-dev

2015-06-24 21:08:31 +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

Merge "Update DngCreator to handle pre-correction dimens." into mnc-dev

2015-06-23 23:33:22 +00:00

inputmethodservice

am 4ca5725f: am 76d2204d: am b1891b3f: Fix selection by double tap in Extracted mode

2015-06-22 13:36:36 +00:00

net

Disallow requesting networks with mutable NetworkCapabilities.

2015-06-23 14:13:10 -04:00

nfc

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

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

os

Merge "Introduce system user and primary user."

2015-06-23 22:44:03 +00:00

preference

Volume: Disable seekbar prefs when zen muted.

2015-06-10 19:04:40 -04:00

print

…

printservice

Propagete document meta-data to custom print UI.

2015-06-11 03:32:09 -07:00

provider

am 242c1f33: am 4475dbca: am 2c99ea35: Merge "Remove not needed contacts related permissions." into mnc-dev

2015-06-23 23:42:34 +00:00

security

Keymaster INT, LONG and DATE tag values are unsigned.

2015-06-23 20:04:28 -07:00

service

Update CarrierService long lived binding API

2015-06-23 14:31:13 -07:00

speech

Delete android.speech.srec.*

2015-06-17 14:14:23 +01:00

test

…

text

Merge "Revive Null check for backward compatibility." into mnc-dev

2015-06-23 08:31:12 +00:00

transition

Suppress Layout during Visibility transitions

2015-06-22 17:19:29 -07:00

util

Camera2: Remove HIGH_RESOLUTION level and modify FULL requirements

2015-06-22 14:21:22 -07:00

view

Introduce stem keycodes for Wear

2015-06-24 13:22:46 -07:00

webkit

Clarify handling client certificates

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

widget

am ff9b80d3: am 44863749: am 9bf9a3a9: Merge "Constrain FastScroller max width to be >= 0" into mnc-dev

2015-06-24 18:57:23 +00:00

package.html

…