Wink Saville 2900a3fae6 Fix build. ...

I tried to get these into the merge conflict resolution,
but didn't succeed.

Change-Id: Id474415869182da438c09f7a75ee54c098fbc81e

2012-08-13 16:50:30 -07:00

api

Merge "Add timestamp in scan results" into jb-mr1-dev

2012-08-13 11:22:22 -07:00

cmds

User Manager service to manage users and query user details

2012-08-11 18:24:07 -07:00

core

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

2012-08-13 16:07:41 -07:00

data

am f52dcf32: am da9754e8: Merge "Fix issue #6860828 Non-root shell can\'t grant permissions" into jb-dev

2012-07-24 22:03:33 -07:00

docs

am 922e038b: am ea31b47a: Merge "fix misc doc bugs from external issues" into jb-dev

2012-08-10 12:36:34 -07:00

drm

Fix an issue where the message queue fails to queue in the looper threads because they are not created.

2012-05-07 14:49:00 -07:00

graphics

Implement ScriptGroup and add test.

2012-08-10 16:02:33 -07:00

icu4j

…

include

Move and rename user activity event type constants.

2012-07-27 18:14:56 -07:00

keystore

am 1ad8bf56: am f0e87175: Merge "Remove useless TestRunner"

2012-08-13 09:49:46 -07:00

libs

Reduce gradients textures size whenever possible

2012-08-08 16:05:42 -07:00

location

Fix a couple of bugs from the location overhaul.

2012-08-10 17:17:32 -07:00

media

am 4da3769d: Merge "mediacodec: Don\'t crash if trying to open a codec that does not exist"

2012-08-13 09:48:24 -07:00

native

libnativehelper is implicitly available.

2012-05-03 16:39:22 -07:00

nfc-extras

Fix BasicNfcEeTest java package.

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

obex

Add NOTICE and MODULE_LICENSE_BSD_LIKE for obex

2012-04-06 14:04:31 -07:00

opengl/java

Enable use of Surface as a native window in EGL14 wrapper.

2012-08-08 18:23:59 -07:00

packages

Import translations. DO NOT MERGE

2012-08-13 13:20:03 -07:00

policy

Merge "User Manager service to manage users and query user details" into jb-mr1-dev

2012-08-11 21:37:08 -07:00

samples/training/network-usage

cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2

2012-08-08 11:27:09 -07:00

sax

…

services

Stop screensaver on incoming phone call.

2012-08-13 16:45:12 -04:00

telephony/java

Fix build.

2012-08-13 16:50:30 -07:00

test-runner

User Manager service to manage users and query user details

2012-08-11 18:24:07 -07:00

tests

Fix build issue with new error checks.

2012-08-10 16:29:00 -07:00

tools

am c1c55afb: am e67f8c8c: Merge "Normalize output from aapt d xmltree"

2012-08-08 12:03:43 -07:00

voip

Use audio_channel_mask_t more consistently

2012-07-03 08:40:46 -07:00

wifi/java/android/net/wifi

am 2605aeeb: am b17a583a: Merge "Fix interface name for tethering"

2012-08-13 16:27:35 -07:00

Android.mk

User Manager service to manage users and query user details

2012-08-11 18:24:07 -07:00

CleanSpec.mk

Telephony: Move AdnRecord.aidl into opt/telephony

2012-08-03 16:47:51 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

Original DnsSd TxtRecord file

2012-04-04 11:37:35 -07:00

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%