Michael Wright f013c3f111 resolve merge conflicts of 57a5cba606 to cw-e-dev. am: bab2b42445 ...

am: b959ce872c

* commit 'b959ce872c37e5f49c8f77ad188fcb9970dcce7a':
  Add SystemUI component to watch for keyboard attachment.

2015-10-20 17:44:46 +00:00

..

accessibilityservice

…

accounts

Add get_accounts app op

2015-09-08 17:54:37 -07:00

animation

…

annotation

…

app

Merge "Retain fragment loaders" into mnc-dr-dev am: ad968cf4e5 am: 6320767fb1

2015-10-20 14:58:40 +00:00

appwidget

…

bluetooth

Implement Bluetooth settings factory reset (2/5)

2015-08-05 10:35:15 -07:00

content

am d56756fd: am 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev

2015-10-16 16:38:29 +00:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

Merge "Add SystemUI component to watch for keyboard attachment." into mnc-dr-dev

2015-10-20 15:31:01 +00:00

inputmethodservice

Fix: Wrong suggestion popup position in extract mode.

2015-07-17 16:36:57 -07:00

net

am 75051c3a: am 7f6d8754: am a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev

2015-10-12 16:55:58 +00:00

nfc

Fix missing copyright headers.

2015-09-07 11:53:59 +02:00

os

am d56756fd: am 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev

2015-10-16 16:38:29 +00:00

preference

am cad75a26: am 627bc805: am ae5a53d7: Merge "Update volume slider on device changed." into mnc-dr-dev

2015-10-15 13:59:47 +00:00

print

…

printservice

…

provider

am 30fd0628: Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev

2015-09-30 20:11:22 +00:00

security

Update KeymasterDefs

2015-09-10 14:00:34 -06:00

service

Add 'until next alarm' option to QS zen panel.

2015-10-15 17:02:00 -04:00

speech

NPE occured when trying to parcel voice features.

2015-08-05 15:48:26 +01:00

test

…

text

Fix line height problem with inline images in StaticLayout.

2015-10-16 02:49:13 -07:00

transition

…

util

Fix issue #23122445: Add 420 density

2015-08-11 17:18:53 -07:00

view

am be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev

2015-10-16 16:18:45 +00:00

webkit

am e869b398: am 20272bec: am c207c943: am c5283927: Close ZipFiles correctly in WebViewFactory.

2015-08-10 16:21:56 +00:00

widget

am 6a06f12c: Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams"

2015-10-07 16:34:35 +00:00

package.html

…