Mike Lockwood 69ccdbd78a Merge commit 'bc52ca2' ...

Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java

Change-Id: I6da33a191a4ac13d08d8350a432b205e3dff85da

2012-04-03 11:53:47 -07:00

api

Merge "Let ViewStub be used in RemoteViews."

2012-04-03 11:25:24 -07:00

cmds

Deleted the media, camera, drm related files since they are relocated

2012-03-28 10:42:44 -07:00

core

Merge "Let ViewStub be used in RemoteViews."

2012-04-03 11:25:24 -07:00

data

Add Japanese specific key codes.

2012-04-02 15:19:45 -07:00

docs

am c1a0e54d: am b459b619: am 945b7cb3: Merge "docs: Accessibility Dev Guide (subsumes Accessibility Best Practices)" into ics-mr1

2012-04-03 10:11:59 -07:00

drm

frameworks base Android.mk file changes

2012-03-28 11:03:25 -07:00

graphics

Rename ioReceive and ioSend

2012-03-29 17:58:15 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

2010-04-07 14:54:51 -07:00

include

Merge "Add Japanese specific key codes."

2012-04-02 17:08:13 -07:00

keystore

Add signing to keystore

2012-03-20 09:04:33 -07:00

libs

Merge "Prevent crash when flushing the layers cache Bug #6258973"

2012-04-02 17:49:20 -07:00

location

docs: Add developer guide cross-references, Project ACRE, round 4

2011-12-22 15:08:23 -08:00

media

Merge commit '830ad08'

2012-04-03 11:50:08 -07:00

native

move ndk headers to frameworks/native

2012-03-23 14:59:35 -07:00

nfc-extras

Fix BasicNfcEeTest java package.

2011-12-09 14:35:32 -08:00

obex

am 0c2d82c6: am 848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem"

2011-05-20 10:51:25 -07:00

opengl/java

Try to survive a failure return from eglMakeCurrent.

2012-03-29 16:24:58 -07:00

packages

Merge "Show action buttons in expanded notifications."

2012-04-02 05:27:03 -07:00

policy

Add new feature to let apps layout over status bar / system bar.

2012-03-30 15:22:04 -07:00

sax

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

services

Merge commit 'bc52ca2'

2012-04-03 11:53:47 -07:00

telephony

Merge "Add DebugService."

2012-04-02 11:49:53 -07:00

test-runner

User management and switching

2012-03-27 11:23:01 -07:00

tests

Merge "Re-enable DisplayList properties."

2012-04-02 15:42:27 -07:00

tools

Merge "Add Delegate for ViewRootImpl#isInTouchMode to prevent IPC call in Eclipse."

2012-03-23 16:29:50 -07:00

voip

RTP: refactor a little bit and fix few minor bugs.

2012-03-30 13:32:16 -07:00

wifi/java/android/net/wifi

Wifi: change empty "engine" config to integer

2012-03-29 17:25:24 -07:00

Android.mk

am af71f328: am 2963ae34: am 4ddfaeb5: Merge "sdk doc change: Added KeyChain API Demo" into ics-mr1

2012-03-31 02:20:37 -07:00

CleanSpec.mk

Moving libRS

2012-03-28 14:18:15 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp

2011-01-17 14:17:12 -08:00

preloaded-classes

Update perf tests to always run each test in a fresh process.

2011-11-07 14:45:49 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%