smain@google.com 2b08f538d1 resolved conflicts for merge of 132004f8 to master ...

Change-Id: I35c6ef810daf2b1329c46798fe6c7e6f2c1dfc82

2014-12-09 14:14:11 -08:00

api

Add UtteranceProgressListener#onStop callback

2014-12-09 11:06:06 +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

Add UtteranceProgressListener#onStop callback

2014-12-09 11:06:06 +00:00

data

Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev

2014-12-05 07:27:33 +00:00

docs

resolved conflicts for merge of 132004f8 to master

2014-12-09 14:14:11 -08:00

drm

Frameworks/base: Wall Werror in drm

2014-11-10 17:23:02 -08:00

graphics

am 9bb5cef9: am 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator target setup when mutate." into lmp-mr1-dev

2014-12-09 00:18:02 +00:00

include

Merge commit '0953ab27' into manualmerge

2014-12-05 11:06:21 -08:00

keystore

Track change to Conscrypt

2014-11-26 09:08:40 -08:00

libs

am e97908d3: Merge commit \'0953ab27\' into manualmerge

2014-12-05 19:16:27 +00:00

location

am 00916297: am 3546c9a5: Merge "Mark Gps Raw related APIs as System APIs. b/16727892" into lmp-mr1-dev

2014-11-07 18:43:36 +00:00

media

am 83d0c86b: am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" into lmp-mr1-dev

2014-12-09 11:06:11 +00:00

native

Merge "Frameworks/base: Wall Werror in native/graphics"

2014-11-11 01:56:11 +00:00

nfc-extras

…

obex

…

opengl/java

Re-allow suppressing onDetachedFromWindow

2014-10-01 10:38:07 -07:00

packages

am 5550a408: am 5b8c5dd4: am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev

2014-12-09 01:00:40 +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

Fix bug in passing of context flags and version.

2014-12-02 12:37:04 -08:00

samples/training/network-usage

…

sax

…

services

am a565716a: am 14965d0e: am 2abd2dd1: Merge "TIF: TvInputHardwareManager to listen to volume changes" into lmp-mr1-dev

2014-12-09 11:06:16 +00:00

telecomm/java

Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev

2014-12-06 01:45:12 +00:00

telephony/java

am 657f25e9: am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev

2014-12-09 00:59:40 +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

Add UtteranceProgressListener#onStop callback

2014-12-09 11:06:06 +00:00

tools

am e97908d3: Merge commit \'0953ab27\' into manualmerge

2014-12-05 19:16:27 +00:00

wifi/java/android/net/wifi

am 820ba1f9: am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev

2014-12-09 01:00:29 +00:00

Android.mk

am 83d0c86b: am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" into lmp-mr1-dev

2014-12-09 11:06:11 +00:00

CleanSpec.mk

Obliterate LockPatternUtilsCache

2014-11-12 11:31:38 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Revert "Revert "Frameworks/base: Update to preloaded-classes""

2014-10-02 19:05:44 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%