Torne (Richard Coles) ccd0204e9d resolved conflicts for merge of f96b93e2 to master ...

Change-Id: I28dbc39dde7bf5c8bb50cff0f6bc49a90c9c4dbe

2013-10-15 14:04:16 +01:00

api

am 25b99efb: am ac0cb359: am 8e656df0: Merge "Add extras to AFD, send orientation metadata." into klp-dev

2013-10-15 04:02:48 -07:00

cmds

am 65d57713: am bacb5422: Merge "Also rely on enabled notification listeners for RemoteController registration" into klp-dev

2013-10-07 10:10:08 -07:00

core

resolved conflicts for merge of f96b93e2 to master

2013-10-15 14:04:16 +01:00

data

remove U+261d from MTLmr3m.ttf

2013-10-14 09:29:11 -07:00

docs

am a8891de3: am 9ecc2904: am da5d7027: am 5a99a702: am 4dfe8944: Merge "add docs about managing app memory" into jb-mr2-docs

2013-10-14 10:07:21 -07:00

drm

…

graphics

DO NOT MERGE: Hide new camera API.

2013-10-11 19:26:08 +00:00

include

move libandroidfw to frameworks/native

2013-10-03 10:30:18 -07:00

keystore

…

libs

move libandroidfw to frameworks/native

2013-10-03 10:30:18 -07:00

location

…

media

Merge "DO NOT MERGE: Hide new camera API." into klp-dev

2013-10-13 01:50:30 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

am 61cab9d3: am 334e3d7c: am ee8ee0ee: Merge "Put DessertCase on a diet." into klp-dev

2013-10-15 05:05:51 -07:00

policy

am 0e10dfeb: am 2c345435: am 79a0ed58: Merge "Move the wallpaper beneath the keyguard." into klp-dev

2013-10-15 04:02:23 -07:00

samples/training/network-usage

…

sax

…

services

am 8d983713: am 5505706c: am cdb9ea79: Merge "Package checks for resloving recovery tokens should be user sensitive." into klp-dev

2013-10-15 04:03:30 -07:00

telephony/java

Merge "Telephony: Read signal strength values as expected" into klp-dev

2013-10-14 21:58:57 +00:00

test-runner

Add <intent-filter> support to <provider>.

2013-10-07 14:19:13 -07:00

tests

am 2101df58: am 496fd28f: am d394355d: Delete HttpHeaderTest.testCacheControlMultipleArguments.

2013-10-15 05:06:26 -07:00

wifi/java/android/net/wifi

am dcc31551: am e9d99705: am 72dc0b43: Merge "Make Wifi Scans more heap-efficient" into klp-dev

2013-10-14 10:49:34 -07:00

Android.mk

am 5c880d0d: am 6f688e87: am 8f34715b: Merge "Refactor how the print dialog activity is started." into klp-dev

2013-10-11 10:11:05 -07:00

CleanSpec.mk

am 5c880d0d: am 6f688e87: am 8f34715b: Merge "Refactor how the print dialog activity is started." into klp-dev

2013-10-11 10:11:05 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove old WebView classes from zygote preload list.

2013-10-15 10:45:18 +01:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%