Benjamin Franz 94a20a2efd resolved conflicts for merge of 31706d99 to master ...

Change-Id: Ic3acad0d2d82ff8f0e5d31d3490c009d242d860b

2015-06-29 17:39:31 +01: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 31706d99 to master

2015-06-29 17:39:31 +01:00

appwidget

AppWidgetServiceImpl should use ParceledListSlice as return object

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

bluetooth

Preventing leak

2015-06-25 19:20:38 +00:00

content

am de3d02e4: am e436e19e: am b035c6d9: Merge "Properly scope the "only http/https schemes" intent filter semantics" into mnc-dev

2015-06-27 01:21:11 +00:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev

2015-06-26 22:09:37 +00:00

inputmethodservice

am 6a402ca6: am d408d293: am ab142f7f: Merge "Handle back key to cancel text action mode in full-screen IME." into mnc-dev

2015-06-25 20:16:27 +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

am c063f1cf: am 97abd672: am d5f387bc: Merge "Looks like MNC is gonna be API 23." into mnc-dev

2015-06-27 01:07:16 +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 be17a55c: am 6a01c7ff: am 263b6e69: Merge "Prevent certain actions of app has revoked permissions" into mnc-dev

2015-06-25 20:15:59 +00:00

security

Merge "Use standard copyright banner in android/security/keymaster." into mnc-dev

2015-06-25 15:07:28 +00:00

service

Merge "Clarify the intention of setNotificationsShown" into mnc-dev

2015-06-26 20:34:33 +00:00

speech

Fix crash with engines that don't override getVoices().

2015-06-26 16:25:37 +01:00

test

…

text

Merge "Text selection: Fix word boundaries for languages without spaces" into mnc-dev

2015-06-26 17:33:22 +00:00

transition

Merge "Fix endTransition index out of bounds exception." into mnc-dev

2015-06-26 21:18:57 +00:00

util

Add Validation logging.

2015-06-26 11:12:39 -07:00

view

am 6b37bc50: am 45cb8b12: am 6356d3b2: Merge "Improve docs for View#addChildrenForAccessibility" into mnc-dev

2015-06-26 21:05:17 +00:00

webkit

am 37c68894: am a78c0e0b: Merge "Fixed Javadoc typos"

2015-06-25 10:02:08 +00:00

widget

am 45034326: am a7c725f2: am e96b1c6f: Merge "Fix crash due to reverse selection." into mnc-dev

2015-06-29 03:36:46 +00:00

package.html

…