Craig Mautner 177f91d1ed am 9d9aac4c: resolved conflicts for merge of 2bf3800b to stage-aosp-master ...

* commit '9d9aac4cacce75b4847aebce0f019250dc3b4e93':
  Doesn't re-sort app windows when move task to top

2014-10-29 17:11:12 +00:00

api

DO NOT MERGE Fix lmp-sprout-dev build for generics addition

2014-10-27 19:19:22 -07:00

cmds

am 09a7d324: am 388dbd28: Merge "Include <time.h> for clock_nanosleep."

2014-10-21 17:59:04 +00:00

core

Merge "Add hotspot icon to status bar" into lmp-mr1-dev automerge: 09895be

2014-10-28 19:40:06 +00:00

data

am 99cc35bb: Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev

2014-10-11 00:24:03 +00:00

docs

am 989f4bfd: am f4e32145: am 61fcad92: docs: Add SearchXonY to Common Intents automerge: be07f2a

2014-10-28 19:42:19 +00:00

drm

…

graphics

am eba0a750: Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev automerge: 91a1a72

2014-10-24 23:03:11 +00:00

include

…

keystore

…

libs

am 31b76b66: Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev

2014-10-28 18:09:20 +00:00

location

am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev

2014-10-10 04:26:40 +00:00

media

Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev automerge: aab38b7

2014-10-28 06:23:59 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev automerge: 8c01dfc

2014-10-28 19:41:21 +00:00

policy

am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev

2014-10-24 02:04:11 +00:00

rs

…

samples/training/network-usage

…

sax

…

services

am f5c00c1c: Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev

2014-10-28 18:04:15 +00:00

telecomm/java

Merge "Remove TODO in TelecomManager." into lmp-mr1-dev

2014-10-23 23:09:16 +00:00

telephony/java

am 4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev

2014-10-27 21:30:48 +00:00

test-runner

am 6c995613: am 301d2276: am 49e2371a: Merge "Log exception when creating Activity in ActivityUnitTestCase." into lmp-sprout-dev

2014-10-10 04:26:18 +00:00

tests

Surface:lockHardwareCanvas DO NOT MERGE

2014-10-22 08:33:31 -07:00

tools

Merge "aapt updates for Android TV" into lmp-mr1-dev automerge: 6af7d76

2014-10-24 21:24:59 +00:00

wifi/java/android/net/wifi

am f2a598e4: am 074c5b5b: Merge "Don\'t drop WifiConfiguration\'s ephemeral bit on copy/parcel." into lmp-mr1-dev

2014-10-15 15:58:47 +00:00

Android.mk

Docs: Add TOC page for Wearable samples

2014-10-23 09:29:05 -07:00

CleanSpec.mk

…

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%