The Android Open Source Project 150edcaf8b am 90976c84: (-s ours) Reconcile with jb-mr1.1-release - do not merge ...

# By Adam Powell
# Via The Android Automerger (1) and The Android Open Source Project (1)
* commit '90976c8493ab9439eb8ddaad30aaa0d171467f43':
  Fix re-enabled state of up after action view collapse

2013-02-06 09:13:58 -08:00

api

Renaming some APIs

2013-02-05 14:07:15 -08:00

cmds

App ops: new operations for SMS.

2013-02-05 11:56:12 -08:00

core

Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'"

2013-02-06 12:57:38 +00:00

data

Add initial plumbing for brightness keys

2013-02-01 16:29:59 -08:00

docs

am c92199be: am 33fb8f63: am dfa8d028: am 5e9be5bc: am d6e0c147: Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev

2013-02-05 15:29:18 -08:00

drm

Move stream creation outside of DrmOutputStream.

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

graphics

Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'"

2013-02-06 12:57:38 +00:00

icu4j

…

include

Add initial plumbing for brightness keys

2013-02-01 16:29:59 -08:00

keystore

am 74637db2: Merge "AndroidKeyStore: return error code on error"

2013-02-04 17:35:35 -08:00

libs

Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'"

2013-02-06 12:57:38 +00:00

location

Annotate Locations coming from mock providers

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

media

am 78c2d8b3: Merge "AudioRecord: allow front + back mic capture"

2013-01-31 22:59:04 -08:00

native

Fix typo

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

nfc-extras

…

obex

…

opengl/java

DdmServer: add controls for OpenGL tracing

2012-12-19 16:31:56 -08:00

packages

Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'"

2013-02-06 12:57:38 +00:00

policy

Fix graphics corruption in WiFi password dialogs

2013-02-04 18:49:38 -08:00

samples/training/network-usage

…

sax

…

services

Merge "Fix addGpsStatusListener"

2013-02-06 17:01:56 +00:00

telephony/java

Fixing up doc links.

2013-02-04 11:17:19 -08:00

test-runner

App ops: new operations for SMS.

2013-02-05 11:56:12 -08:00

tests

Add support for non-antialiased text

2013-02-05 14:44:43 -08:00

tools

Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'"

2013-02-06 12:57:38 +00:00

wifi/java/android/net/wifi

Allow null serverAddress

2013-02-05 15:36:21 -08:00

Android.mk

am 25f97435: am 5fca0efa: am 6cb87b08: am 65fd9811: am 2aa47b33: Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev

2013-02-04 13:17:32 -08:00

CleanSpec.mk

Cleanstep for SmsRawData.

2013-02-03 08:29:53 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%