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

* commit '7a79c4cac3b0c722832e868346db2375b6d6c379':
  Stop using namespace std.

2015-03-05 23:56:53 +00:00

api

Merge "Allow device and profile owners to set a user icon."

2015-03-05 23:39:04 +00:00

cmds

Add a list verb to the settings cmd.

2015-03-05 08:35:37 -05:00

core

Merge "Cleanup Bitmap JNI attempt #2"

2015-03-05 23:55:14 +00:00

data

Remove Roboto fonts and their build rules

2015-02-25 14:52:35 -08:00

docs

am dcfa5e03: 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:46:49 +00:00

drm

…

graphics

Cleanup Bitmap JNI attempt #2

2015-03-05 13:56:16 -08:00

include

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

2015-01-27 23:34:35 +00:00

keystore

am f271fa33: am cdc70256: am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"

2015-02-24 04:54:41 +00:00

libs

Remove uncessary include for SkPorterDuff.h

2015-03-05 16:22:17 -05:00

location

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

media

Cleanup Bitmap JNI attempt #2

2015-03-05 13:56:16 -08:00

native

Cleanup Bitmap JNI attempt #2

2015-03-05 13:56:16 -08:00

nfc-extras

…

obex

…

opengl/java

Cleanup Bitmap JNI attempt #2

2015-03-05 13:56:16 -08:00

packages

Merge "Audio: Remove the concept of master volume."

2015-03-04 22:59:41 +00:00

rs

Cleanup Bitmap JNI attempt #2

2015-03-05 13:56:16 -08:00

samples/training/network-usage

…

sax

…

services

Merge "Cleanup Bitmap JNI attempt #2"

2015-03-05 23:55:14 +00:00

telecomm/java

Hide calllog entries for unregistered phone accounts

2015-03-03 00:33:35 +00:00

telephony/java

Merge "Remove unused imports in frameworks/base."

2015-03-02 20:43:50 +00:00

test-runner

Fix some javadocs typos

2015-03-02 07:07:05 -08:00

tests

Add generic "INTERACTION" event type to UsageStatsManager

2015-03-02 12:54:14 -08:00

tools

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

2015-03-05 23:56:53 +00:00

wifi/java/android/net/wifi

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

Android.mk

Merge "Add ChooserTargetService API"

2015-03-05 00:07:53 +00:00

CleanSpec.mk

Clean-up stale inputflinger binaries and associated libs.

2015-02-24 12:11:37 -08: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%