Ben Gruver 7b879f4b93 resolved conflicts for merge of 0929c3b1 to master ...

Change-Id: I70d4b652e804f3e607b1cd1b6837204c77610d87

2013-04-08 14:56:55 -07:00

api

am 855841cc: am cf837a6e: Merge "Update DataUsageStatColumns" into jb-mr2-dev

2013-04-08 14:28:50 -07:00

cmds

am 3793b928: am bc948101: Merge "Have audio service clean up new receivers in crashing processes." into jb-mr2-dev

2013-04-08 13:24:28 -07:00

core

am 855841cc: am cf837a6e: Merge "Update DataUsageStatColumns" into jb-mr2-dev

2013-04-08 14:28:50 -07:00

data

Merge "Update Roboto to version 1.200311" into jb-mr2-dev

2013-04-05 23:53:21 +00:00

docs

Merge "Remove all public mention of RS graphics from docs." into jb-mr2-dev

2013-04-05 22:47:29 +00:00

drm

Move stream creation outside of DrmOutputStream.

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

graphics

am e7abcc7d: am bdc87d50: Merge "Remove all public mention of RS graphics from docs." into jb-mr2-dev

2013-04-05 15:58:06 -07:00

include

Merge "Pipe through device resolution information" into jb-mr2-dev

2013-04-05 21:43:31 +00:00

keystore

Revert "Remove AndroidKeyStore from API"

2013-04-06 10:05:31 -07:00

libs

am aaddfacf: am bdb706e4: Merge "Pipe through device resolution information" into jb-mr2-dev

2013-04-05 15:46:40 -07:00

location

Annotate Locations coming from mock providers

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

media

am 3793b928: am bc948101: Merge "Have audio service clean up new receivers in crashing processes." into jb-mr2-dev

2013-04-08 13:24:28 -07:00

native

Fix typo

2012-12-12 11:27:44 +08:00

nfc-extras

Add exception types for NfcEe operations.

2013-02-12 13:43:30 -08:00

obex

…

opengl/java

Fix createSurface / eglCreateWindowSurface race.

2013-03-18 22:55:27 -07:00

packages

am fc9b371e: am 04c83357: Merge "Awaken dreams on home + recents." into jb-mr2-dev

2013-04-08 13:13:51 -07:00

policy

am fc9b371e: am 04c83357: Merge "Awaken dreams on home + recents." into jb-mr2-dev

2013-04-08 13:13:51 -07: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

resolved conflicts for merge of 0929c3b1 to master

2013-04-08 14:56:55 -07:00

telephony/java

Fix SignalStrength response.

2013-04-08 11:35:47 -07:00

test-runner

New ContentProvider initialization for testing.

2013-02-26 16:16:14 -08:00

tests

am fe2902b4: am 0e78de6c: Add tag "foo" to builder test\'s notifications.

2013-04-08 08:21:10 -07:00

tools

am ecc5b436: am 745a42bb: Merge "aapt: add support for optional uses-permission" into jb-mr2-dev

2013-04-04 17:34:29 -07:00

wifi/java/android/net/wifi

Merge "Scope certs for wifi UID and handle migration" into jb-mr2-dev

2013-03-29 17:32:44 +00:00

Android.mk

resolved conflicts for merge of 29211d3a to master

2013-04-05 16:18:59 -04:00

CleanSpec.mk

New NotificationListenerService.

2013-04-05 19:54:44 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

update preloaded-classes

2013-03-11 09:59:13 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%