John Reck 1022888d33 resolved conflicts for merge of 203c8171 to master ...

Change-Id: I256397410c261fae049bae4572f132235be1c5c9

2014-12-04 16:06:34 -08:00

api

am 29ac679f: am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev

2014-12-04 21:55:19 +00:00

cmds

am bedd1744: am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev

2014-12-03 20:42:17 +00:00

core

resolved conflicts for merge of 203c8171 to master

2014-12-04 16:06:34 -08:00

data

…

docs

am 431b65d1: am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev

2014-12-04 20:44:58 +00:00

drm

…

graphics

resolved conflicts for merge of 203c8171 to master

2014-12-04 16:06:34 -08:00

include

am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays"

2014-12-04 09:21:45 +00:00

keystore

…

libs

resolved conflicts for merge of a75b0ad3 to master

2014-12-04 13:51:41 -08:00

location

…

media

am e762f986: am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"

2014-12-04 19:59:09 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

am c82144fd: am 95931270: am 32b61ab2: Merge "Doze: Don\'t block pickup pulses on a proximity check." into lmp-mr1-dev

2014-12-04 21:55:34 +00:00

policy

am 56f10c26: am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev

2014-12-03 20:43:40 +00:00

rs

…

samples/training/network-usage

…

sax

…

services

am 51347595: am a6ecb61e: am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev

2014-12-04 21:56:22 +00:00

telecomm/java

Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev

2014-12-03 18:09:31 +00:00

telephony/java

am 10f47f92: am 38916819: am 1fb69936: Merge "IMS Call End Cause Additions" into lmp-mr1-dev

2014-12-04 21:55:29 +00:00

test-runner

…

tests

…

tools

am 9c403d85: am 43d0e675: am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev

2014-12-04 21:56:16 +00:00

wifi/java/android/net/wifi

…

Android.mk

am 29ac679f: am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev

2014-12-04 21:55:19 +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%