Joe Fernandez d8f6719fe7 resolved conflicts for merge of 559a00ad to klp-dev-plus-aosp ...

Change-Id: I61d94548141269f4208abc100c44278d44e7611b

2013-11-04 16:31:46 -08:00

api

Un-deprecate setInexactRepeating() and tweak docs

2013-10-25 16:55:36 -07:00

cmds

am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."

2013-10-29 13:35:04 -07:00

core

am 24a24b27: am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev

2013-11-01 13:30:51 -07:00

data

Change yMax of Roboto fonts from 2146 to 2163

2013-10-24 18:50:25 -07:00

docs

am 929ff3e0: am 62eecbf5: Merge "Doc change: Extend link to image." into klp-dev

2013-11-01 12:00:14 -07:00

drm

…

graphics

Update the PdfDocument docs with unsupported operations.

2013-10-31 08:10:12 -07:00

include

…

keystore

…

libs

am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."

2013-10-29 13:35:04 -07:00

location

…

media

Merge "MediaPlayer: MTP: update state only based on source events" into klp-dev

2013-10-28 21:59:55 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

am 6b149dcf: am c5481343: Merge "Fix weird page snap bug when long pressing on music controls (issue 11420449)" into klp-dev

2013-11-01 11:54:36 -07:00

policy

am 1dbaf904: am 18612840: Merge "Force relayout at completion of status bar animation" into klp-dev

2013-10-30 07:02:39 -07:00

samples/training/network-usage

…

sax

…

services

am 93e363fe: am 91230fb3: Merge "Fixing issues in the TouchExplorer." into klp-dev

2013-11-01 11:51:03 -07:00

telephony/java

Merge "Enhance pin/puk support" into klp-dev

2013-10-25 16:40:55 +00:00

test-runner

…

tests

…

tools

am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."

2013-10-29 13:35:04 -07:00

wifi/java/android/net/wifi

…

Android.mk

Enable samples browsing in builds.

2013-10-30 23:04:38 -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%