Jaikumar Ganesh 6dd4531639 resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp ...

Change-Id: I75fcd15f85f2cb3912ada1df453fb02bd13e5d85

2011-07-13 12:29:57 -07:00

api

am 351ddeb2: am 5db9ff97: Update final 13 API def.

2011-06-27 17:11:15 -07:00

build

Fix the naming of the heap growth limit property.

2011-02-01 20:21:48 -08:00

cmds

Allow vril-dump to work on user builds

2011-07-06 09:30:28 -07:00

core

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

2011-07-13 12:29:57 -07:00

data

am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2

2011-06-14 11:40:06 -07:00

docs

docs: de-new sidenavs

2011-07-11 16:03:10 -07:00

drm

Fix for bug 4126624.

2011-03-24 13:14:02 -07:00

graphics

am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."

2011-06-24 12:20:24 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread

2011-06-28 18:53:51 -07:00

keystore

Update the path of the intent to unlock keystore.

2011-01-20 20:23:59 +08:00

libs

am e3b05d09: Merge "Tweaks for forward-compatibility"

2011-06-20 09:05:07 -07:00

location

am 98395483: am 9f2cbf14: am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."

2011-06-30 08:25:13 -07:00

media

am 88748e6d: am d86302df: Quiet the log.

2011-06-10 07:46:27 -07:00

native

Add "tv" density for 720p screens.

2011-05-27 13:40:26 -07:00

nfc-extras

Add intent actions for new firmware events.

2011-06-27 18:46:31 -07:00

obex

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

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

opengl

Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)

2011-06-22 20:18:18 +01:00

packages

am e0da3f3b: am 444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2

2011-06-20 17:34:33 -07:00

policy

am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE

2011-06-16 12:34:34 -07:00

sax

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

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

services

am 8171e6f6: Use resetConnections with resetMask.

2011-07-08 09:40:08 -07:00

telephony

am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE

2011-07-13 10:21:38 -07:00

test-runner

DO NOT MERGE. Integrate from master: Rework display size access.

2011-05-16 11:58:27 -07:00

tests

am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2

2011-05-31 18:11:29 -07:00

tools

am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.

2011-07-11 12:46:07 -07:00

voip

am a7a9c4cb: am 46524f83: Merge "docs: add package description for RTP" into honeycomb-mr1

2011-05-05 18:02:47 -07:00

vpn

VpnService: stop VPN when unknown DNS servers show up.

2011-07-08 17:59:54 -07:00

wifi/java/android/net/wifi

Use resetConnections with resetMask.

2011-07-07 16:17:06 -07:00

Android.mk

am da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2

2011-06-21 11:11:18 -07:00

CleanSpec.mk

resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp

2011-03-14 10:28:11 -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 00118a48 to honeycomb-merge

2011-01-27 18:25:32 -08:00

preloaded-classes

Removing android.security.MessageDigest

2011-02-01 22:25:47 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%