Dan Albert 7a79c4cac3 am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-aosp-master ...

* commit 'f8d6a4ba8739e16e13ae0014efa099ec564939a7':
  Stop using namespace std.

2015-03-05 23:50:35 +00:00

api

am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev

2015-02-25 18:17:13 +00:00

cmds

am 72dc62ea: Merge "Track removal of refcounts from FileMap."

2015-02-24 12:56:52 +00:00

core

am 9c0ba24f: am 6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"

2015-03-05 17:33:13 +00:00

data

Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev

2014-12-05 07:27:33 +00:00

docs

am 6e3c763f: am 685e6ce8: am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs

2015-03-05 23:38:31 +00:00

drm

Frameworks/base: Wall Werror in drm

2014-11-10 17:23:02 -08:00

graphics

am d002e027: Merge "Fix \'fuchsia\' typo."

2015-02-21 17:09:46 +00:00

include

am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev

2015-01-27 18:33:46 +00:00

keystore

Add new IKeystoreService methods to KeyStore

2015-02-23 14:12:44 -08:00

libs

am 72dc62ea: Merge "Track removal of refcounts from FileMap."

2015-02-24 12:56:52 +00:00

location

am a4c40c37: am 72d33849: Merge "Missing break in switch statement"

2014-12-30 12:29:38 +00:00

media

am 6da3cc59: am 396f131d: Merge "Fix memory leak"

2015-02-11 00:00:57 +00:00

native

Merge "Frameworks/base: Wall Werror in native/graphics"

2014-11-11 01:56:11 +00:00

nfc-extras

…

obex

…

opengl/java

…

packages

am bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.

2015-03-04 23:15:51 +00:00

policy

am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev

2015-02-25 21:40:38 +00:00

rs

am caa8a8fb: Merge "[Renderscript] JAVA API update for Allocation.CopyTo add the following functions to make it more symmetric to copyFrom()."

2015-03-03 01:11:18 +00:00

samples/training/network-usage

…

sax

…

services

am ecc20aaf: am 63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly"

2015-03-05 22:46:49 +00:00

telecomm/java

Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev

2015-02-02 15:48:53 +00:00

telephony/java

am 654a473b: am 249f2c3a: am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev

2015-02-26 23:37:55 +00:00

test-runner

am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev

2014-11-21 00:43:51 +00:00

tests

am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev

2015-01-14 20:47:47 +00:00

tools

am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-aosp-master

2015-03-05 23:50:35 +00:00

wifi/java/android/net/wifi

Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev automerge: d169839

2015-01-29 05:00:44 +00:00

Android.mk

am 66b4366e: am a2bbdb96: am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev

2015-03-03 02:00:51 +00:00

CleanSpec.mk

Obliterate LockPatternUtilsCache

2014-11-12 11:31:38 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Manually add SignalStrength to preloaded-classes

2015-03-04 21:56:26 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%