Andreas Gampe 307218c7f2 resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp ...

Change-Id: I4b47723a9314bf9bef08e68ce269038d0d50c5d9

2014-11-21 09:57:52 -08:00

api

Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev

2014-11-21 01:31:10 +00:00

cmds

am 28096c49: Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev

2014-11-21 03:01:09 +00:00

core

am 0da1cbaa: am e042791e: Merge "Frameworks/base: Remove unused header"

2014-11-21 17:47:57 +00:00

data

…

docs

am d4ea7b3c: am 9aede602: am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge: 161dce4

2014-11-21 10:26:37 +00:00

drm

…

graphics

am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev

2014-11-21 02:53:38 +00:00

include

Merge commit '06d8b7b8' into manualmerge

2014-11-17 12:17:16 -08:00

keystore

…

libs

resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp.

2014-11-20 16:38:06 -08:00

location

…

media

resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp

2014-11-21 09:57:52 -08:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

am ed06df13: am 1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev

2014-11-21 03:45:30 +00:00

policy

am e672db28: am ed097689: Merge "Add animations for the system bar color views" into lmp-mr1-dev

2014-11-18 20:32:28 +00:00

rs

Fix format strings mismatching the parameters passed to them

2014-11-20 15:24:46 -08:00

samples/training/network-usage

…

sax

…

services

am b3d0580f: am 08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev

2014-11-21 15:28:20 +00:00

telecomm/java

Merge "Change Connections to allow setting conferenceable with conferences." into lmp-mr1-dev

2014-11-20 03:40:10 +00:00

telephony/java

am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev

2014-11-21 02:41:53 +00:00

test-runner

am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev

2014-11-21 00:43:51 +00:00

tests

am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev

2014-11-21 02:53:38 +00:00

tools

am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge: ddc83df

2014-11-21 10:17:00 +00:00

wifi/java/android/net/wifi

am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev

2014-11-19 22:13:18 +00:00

Android.mk

Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev

2014-11-20 23:07:43 +00:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%