Dongwon Kang 27c7a7d06b Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev automerge: f6df7bf ...

automerge: d048789

* commit 'd048789aeaf64779a7062faa3bd806c69652857a':
  TIF: Define more cannonical genres in TvContract

2014-10-24 03:24:49 +00:00

api

Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev

2014-10-24 02:24:18 +00:00

cmds

am 09a7d324: am 388dbd28: Merge "Include <time.h> for clock_nanosleep."

2014-10-21 17:59:04 +00:00

core

Merge "CEC: Fix JavaDoc errors." into lmp-mr1-dev automerge: fa76518

2014-10-24 02:39:34 +00:00

data

am 99cc35bb: Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev

2014-10-11 00:24:03 +00:00

docs

am bc3b3439: am fd73db22: am 578210db: Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev

2014-10-24 01:58:57 +00:00

drm

…

graphics

am f3ab4410: am fa9ed8ca: Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev

2014-10-23 22:04:11 +00:00

include

…

keystore

…

libs

am 879f237a: Merge "Added some more Split density tests" into lmp-mr1-dev

2014-10-24 02:01:16 +00:00

location

am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev

2014-10-10 04:26:40 +00:00

media

Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev automerge: f6df7bf

2014-10-24 03:24:49 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Volume: Make VolumeUI startup configurable." into lmp-mr1-dev automerge: 84f9ab2

2014-10-24 02:07:06 +00:00

policy

am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev

2014-10-24 02:04:11 +00:00

rs

…

samples/training/network-usage

…

sax

…

services

Merge "TIF: fix wrong config comparison & confusing method name" into lmp-mr1-dev automerge: cfc7323

2014-10-24 02:08:06 +00:00

telecomm/java

Merge "Remove TODO in TelecomManager." into lmp-mr1-dev

2014-10-23 23:09:16 +00:00

telephony/java

am d9afc9c5: am 2b0a2ad3: am c11a944a: [DS] Change the copyright

2014-10-23 22:03:53 +00:00

test-runner

am 6c995613: am 301d2276: am 49e2371a: Merge "Log exception when creating Activity in ActivityUnitTestCase." into lmp-sprout-dev

2014-10-10 04:26:18 +00:00

tests

Surface:lockHardwareCanvas DO NOT MERGE

2014-10-22 08:33:31 -07:00

tools

Merge commit 'cd8442d4' into manualmerge

2014-10-23 14:55:57 -07:00

wifi/java/android/net/wifi

am f2a598e4: am 074c5b5b: Merge "Don\'t drop WifiConfiguration\'s ephemeral bit on copy/parcel." into lmp-mr1-dev

2014-10-15 15:58:47 +00:00

Android.mk

Docs: Add TOC page for Wearable samples

2014-10-23 09:29:05 -07:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Revert "Revert "Frameworks/base: Update to preloaded-classes""

2014-10-02 19:05:44 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%