Jake Hamby e4f8539089 am 223d699d: am c452a40e: am 044a9b97: resolved conflicts for merge of b35e4d77 to jb-dev-plus-aosp ...

* commit '223d699d24bcf6687bfda13c0a334594c965ba16':
  Fix CDMA decoding of multipart UTF-16 SMS messages.

2012-08-29 18:23:47 -07:00

api

am f1b88ab2: am d5ea3b46: Merge "Add initial multi-display support." into jb-mr1-dev

2012-08-29 15:49:56 -07:00

cmds

Start implementing concept of "running" users.

2012-08-28 16:30:55 -07:00

core

am 0322498e: am 12631ec3: Merge "Start implementing concept of "running" users." into jb-mr1-dev

2012-08-29 18:20:09 -07:00

data

Fix installing applications from non-primary users.

2012-08-27 15:16:33 -07:00

docs

am 004b2661: am 14b83959: am 2f1ec0db: am cf9e9d62: Design doc change: Update download zips for design bundle and Roboto.

2012-08-24 14:49:46 -07:00

drm

Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev

2012-08-22 14:50:27 -07:00

graphics

Add plumbing for new surface flinger display API.

2012-08-27 14:34:54 -07:00

icu4j

…

include

Add plumbing for new surface flinger display API.

2012-08-27 14:34:54 -07:00

keystore

Always-on VPN.

2012-08-27 12:35:05 -07:00

libs

Use smoothstep to eliminate branches in AA shader

2012-08-29 11:14:52 -07:00

location

Fix some location issues exposed by CTS.

2012-08-21 16:26:26 -07:00

media

Merge "Add plumbing for new surface flinger display API." into jb-mr1-dev

2012-08-27 17:16:53 -07:00

native

Add plumbing for new surface flinger display API.

2012-08-27 14:34:54 -07:00

nfc-extras

…

obex

…

opengl/java

Rename UserId to UserHandle.

2012-08-16 12:46:38 -07:00

packages

am 1f2e9b59: am b2c94ec8: Merge "Change default setting for dreams to \'when docked\'" into jb-mr1-dev

2012-08-29 15:58:22 -07:00

policy

Merge "Fix MENU key in keyguard." into jb-mr1-dev

2012-08-29 16:58:35 -07:00

samples/training/network-usage

…

sax

…

services

Merge "Start implementing concept of "running" users." into jb-mr1-dev

2012-08-29 18:15:07 -07:00

telephony/java

Unhide some CellSignalStrength methods.

2012-08-28 12:05:16 -07:00

test-runner

Keep track of whether an app is installed for each user.

2012-08-24 13:53:13 -07:00

tests

Merge "Fix bug in grain." into jb-mr1-dev

2012-08-21 17:09:56 -07:00

tools

Keep track of whether an app is installed for each user.

2012-08-24 13:53:13 -07:00

voip

…

wifi/java/android/net/wifi

Fix DHCP handling at disconnect/reconnect

2012-08-29 15:35:57 -07:00

Android.mk

am 0322498e: am 12631ec3: Merge "Start implementing concept of "running" users." into jb-mr1-dev

2012-08-29 18:20:09 -07:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Update preloaded-classes for JB

2012-08-12 19:46:51 +09:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%