Wale Ogunwale 3c36b8e956 resolved conflicts for merge of ca54b876 to master ...

Change-Id: I3148551b9809fb5c36007b26f26acf812b2f654d

2015-03-09 10:37:04 -07:00

api

Merge "Revert "Remove TrustAgent whitelisting API""

2015-03-09 16:04:18 +00:00

cmds

Add new debug feature to automatically create heap dumps.

2015-03-06 16:42:03 -08:00

core

Merge "Revert "Remove TrustAgent whitelisting API""

2015-03-09 16:04:18 +00:00

data

Remove Roboto fonts and their build rules

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

docs

Merge "Fix USB typos"

2015-03-06 16:14:50 +00:00

drm

…

graphics

Annotate methods with size and range annotations

2015-03-07 20:49:19 -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

Merge "Fix unused local variale warning from clang/llvm."

2015-03-07 01:13:50 +00:00

location

Remove unused imports in frameworks/base.

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

media

Merge changes Ib5cc22db,I93e0c449,I65cd4cfd,I1cef3bd4,I628c0468

2015-03-07 23:50:37 +00: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 "Remove leftover code causing trust agent issues"

2015-03-09 16:06:43 +00:00

rs

am 989e03f1: am c1e2bf95: am 4b5af9bc: Merge "[RenderScript] Update the java API about Allocation copyTo & From FieldPacker"

2015-03-08 00:17:34 +00:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of ca54b876 to master

2015-03-09 10:37:04 -07:00

telecomm/java

Hide calllog entries for unregistered phone accounts

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

telephony/java

Merge "Add methods for device telephony configs."

2015-03-06 01:05:08 +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%