Ben Komalo 4b2efcb26f am 6c048260: Merge "Revert encryption mapping for device wipes." ...

* commit '6c048260f30d9bba1a83c4f79388cd6b3109be7d':
  Revert encryption mapping for device wipes.

2011-09-11 16:53:00 -07:00

api

am 8a48a2b9: Merge "Fix build."

2011-09-11 11:22:40 -07:00

build

Change max heap size to 48MB

2011-06-22 16:12:41 -07:00

cmds

am 1d477c53: Merge "Require INTERNET permission for network-based content. Bug #1870981"

2011-09-02 03:32:31 -07:00

core

am 6c048260: Merge "Revert encryption mapping for device wipes."

2011-09-11 16:53:00 -07:00

data

am ce002753: Merge "Add default videos for background replacement."

2011-09-09 09:07:47 -07:00

docs

cherrypick Change-Id: I253ff775829a80fec8e3d1c88ae85af1286a9300

2011-09-02 15:18:20 -07:00

drm

resolved conflicts for merge of 845fdba7 to master

2011-08-04 15:13:14 -07:00

graphics

Pull animation attributes out of main view class.

2011-09-09 14:43:39 -07:00

icu4j

…

include

am 6c048260: Merge "Revert encryption mapping for device wipes."

2011-09-11 16:53:00 -07:00

keystore

Make the KeyChain handled its own grants rather than having

2011-07-13 22:45:07 -07:00

libs

am 6c048260: Merge "Revert encryption mapping for device wipes."

2011-09-11 16:53:00 -07:00

location

Acknowledge that the platform guarantees UTF-8 and UTF-16.

2011-07-19 12:10:07 -07:00

media

am fbab0869: Merge "MTS Recorder Test: Use VideoFrameRate from Device Camcorder Profile"

2011-09-09 17:34:56 -07:00

native

Input system bug fixes, particularly for stylus.

2011-08-19 15:02:26 -07:00

nfc-extras

Preserve invariant that sService is not null (although NfcAdapter.get() can return null)

2011-07-09 23:57:22 -07:00

obex

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

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

opengl

add an option to EGL to dump stack traces on errors

2011-09-06 18:06:04 -07:00

packages

Handle HSPAP.

2011-09-09 14:52:57 -07:00

policy

am 1fe61d73: Merge "Allow lockscreen orientation to be overridden with a system property."

2011-09-09 15:04:27 -07:00

sax

…

services

am 6c048260: Merge "Revert encryption mapping for device wipes."

2011-09-11 16:53:00 -07:00

telephony

Pass roaming info to ConnectivityService.

2011-09-08 12:01:59 -07:00

test-runner

Remove frameworks' reference to an obsolete Bouncycastle keystore file.

2011-09-07 14:52:12 -04:00

tests

am 6f0b2ed3: Merge "aggregating test results when reporting to instrumentation out."

2011-09-11 14:12:35 -07:00

tools

Add RpcData as a built-in marshallable type.

2011-09-06 11:06:41 -07:00

voip

Merge "RTP: support payloads with larger packetization interval."

2011-09-08 14:07:00 -07:00

wifi/java/android/net/wifi

Merge "Finalize wifi watchdog default settings"

2011-09-09 15:15:13 -07:00

Android.mk

am 4f4ed38a: Merge "Fix 5185505: Add support for weak biometric sensors to lockscreen."

2011-09-09 09:06:58 -07:00

CleanSpec.mk

Rename WpsConfiguration to Wps

2011-09-06 22:32:58 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

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

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

preloaded-classes

Fix preloaded classes for the emulator.

2011-08-25 23:51:56 -04:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%