Ying Wang 28af35e8cd resolved conflicts for merge of a976bddd to master ...

Change-Id: I64e1cbfb0eee891ce4d1eee40eefdcedcc501f7f

2013-04-09 23:21:42 -07:00

api

am 84882711: am 808723f2: Merge "Cleanup Allocation and add 3D copies." into jb-mr2-dev

2013-04-09 21:27:49 -07:00

cmds

resolved conflicts for merge of a976bddd to master

2013-04-09 23:21:42 -07:00

core

resolved conflicts for merge of a976bddd to master

2013-04-09 23:21:42 -07:00

data

Update Droid Serif

2013-04-08 14:32:24 -07:00

docs

am 405c6e2d: am d3724e02: am 2568d7f0: am 0bf013fd: am f417fc4a: fix xml error in sample

2013-04-09 10:50:29 -07:00

drm

Add liblog

2013-04-09 21:54:12 -07:00

graphics

resolved conflicts for merge of a976bddd to master

2013-04-09 23:21:42 -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

resolved conflicts for merge of a976bddd to master

2013-04-09 23:21:42 -07:00

location

Annotate Locations coming from mock providers

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

media

resolved conflicts for merge of a976bddd to master

2013-04-09 23:21:42 -07:00

native

Add liblog

2013-04-09 21:54:12 -07:00

nfc-extras

Add exception types for NfcEe operations.

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

obex

…

opengl/java

rework GLSurfaceView so it can use the choreographer

2013-04-09 17:55:32 -07:00

packages

resolved conflicts for merge of a976bddd to master

2013-04-09 23:21:42 -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

…

sax

…

services

resolved conflicts for merge of a976bddd to master

2013-04-09 23:21:42 -07:00

telephony/java

Update function comment for getAllCellInfo

2013-04-09 16:19:27 -07:00

test-runner

New ContentProvider initialization for testing.

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

tests

am 800d99f6: am 9fa49cc3: Merge "Fix [-] buttons in the notification builder test." into jb-mr2-dev

2013-04-09 07:43:27 -07:00

tools

resolved conflicts for merge of a976bddd to master

2013-04-09 23:21:42 -07:00

wifi/java/android/net/wifi

Fix crash bug with mismatched iface names

2013-04-08 18:02:02 -07: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%