Derek Sollenberger 2dbd185fd0 resolved conflicts for merge of c93c6aa5 to master-chromium ...

Change-Id: I51429ed5359355025f873ccab11bfabbbe772a46

2013-01-30 14:32:29 -05:00

api

Deprecate unused and implementation-specific parts of TTS API

2013-01-30 09:37:05 +00:00

cmds

Merge "Implement support for method calls in the content tool."

2013-01-29 20:52:44 +00:00

core

resolved conflicts for merge of c93c6aa5 to master-chromium

2013-01-30 14:32:29 -05:00

data

am 9c4ba4fe: am b616f0c2: add android.permission.LOOP_RADIO for access to loop radio device

2013-01-29 17:09:03 -08:00

docs

am dbdf8767: am 5287cd74: am 6d59e0ea: am a239b933: am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev

2013-01-18 10:37:11 -08:00

drm

Move stream creation outside of DrmOutputStream.

2012-12-17 17:04:16 -08:00

graphics

am 29449a3d: am 781bcd68: am c3ee1d9a: am 7ad885e2: Merge "One more fix for incorrect indices."

2013-01-29 23:04:39 -08:00

icu4j

…

include

Rename ISurfaceTexture and SurfaceTexture

2012-12-18 11:22:21 -08:00

keystore

am 2e99d3c9: am ebb61ca2: Merge "Track libcore changes for OpenSSLKey"

2013-01-25 16:41:33 -08:00

libs

resolved conflicts for merge of c93c6aa5 to master-chromium

2013-01-30 14:32:29 -05:00

location

Annotate Locations coming from mock providers

2013-01-22 09:39:47 -08:00

media

am 6d2def71: am c28fde57: am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"

2013-01-28 10:40:36 -08:00

native

Fix typo

2012-12-19 11:21:38 +08:00

nfc-extras

NfcAdapterExtras: expose driver name.

2012-10-03 14:14:23 -07:00

obex

…

opengl/java

DdmServer: add controls for OpenGL tracing

2012-12-19 16:31:56 -08:00

packages

am 29e4aa7a: Merge "Reinitialize hardware renderer after eglTerminate() Bug #8066455"

2013-01-28 14:10:16 -08:00

policy

Merge "Adding UI test automation APIs."

2013-01-29 03:16:40 +00:00

samples/training/network-usage

cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2

2012-08-08 11:27:09 -07:00

sax

…

services

am da01da17: Merge "Do not turn on imes unexpectedly with unit tests"

2013-01-29 18:45:36 -08:00

telephony/java

am 24dbdc7d: am 23d85a91: am d84d289f: Merge "Telephony: Consider EVDO ecio zero value as valid."

2013-01-23 09:44:04 -08:00

test-runner

Fixing the build

2013-01-28 19:55:35 -08:00

tests

Fix graphical corruption on QCOM GPU

2013-01-29 17:46:17 -08:00

tools

am 573a18cc: Merge "Fixing the build"

2013-01-29 02:15:48 -08:00

wifi/java/android/net/wifi

Merge "Add protected log methods to StateMachine"

2013-01-28 19:56:09 +00:00

Android.mk

Merge "Adding UI test automation APIs."

2013-01-29 03:16:40 +00:00

CleanSpec.mk

Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip

2013-01-28 15:27:47 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Do not preload videoeditor_jni since it breaks the emulator

2012-09-24 10:34:42 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%