Adam Lesinski 8a5bb15efa Fix automerge issue ...

Duplicate method declaration.

Change-Id: I9355bd7c716e668ad7892fd12e93352455d149b5

2014-11-03 20:35:54 -08:00

api

Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev

2014-11-04 01:29:00 +00:00

cmds

am 984cf41a: Merge "Have Pm return the correct code" into lmp-mr1-dev

2014-10-31 20:22:15 +00:00

core

am a3698098: am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed automerge: 5ad0763

2014-11-04 02:50:10 +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 5880c9c2: am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs automerge: 6666f34

2014-11-04 03:15:48 +00:00

drm

…

graphics

am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev

2014-11-01 00:27:30 +00:00

include

Merge "Fix issues that will be present in C++11" into lmp-mr1-dev

2014-11-03 23:38:43 +00:00

keystore

Correct test data size in keystore signing and verification tests.

2014-09-14 17:09:47 +00:00

libs

Merge commit '78be0498' into manualmerge

2014-11-03 18:06:22 -08: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

am e2e7e9df: Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev automerge: 085329b

2014-11-04 03:16:30 +00:00

native

Sensor related changes for NDK.

2014-08-05 19:34:04 -07:00

nfc-extras

…

obex

Bluetooth: Support MAP Client role on Bluedroid.

2014-07-01 18:01:27 +00:00

opengl/java

Re-allow suppressing onDetachedFromWindow

2014-10-01 10:38:07 -07:00

packages

Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev automerge: 3c7efdc

2014-11-04 00:05:04 +00:00

policy

am 68993a41: am 99a6c1cb: Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev automerge: abf33e4

2014-11-04 02:21:05 +00:00

rs

resolved conflicts for merge of 5a2d0432 to lmp-dev-plus-aosp

2014-08-21 23:20:32 -07:00

samples/training/network-usage

…

sax

…

services

am 946863b6: Merge "Fix USB audio disconnect logic" into lmp-mr1-dev

2014-11-03 18:45:52 +00:00

telecomm/java

Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev

2014-11-04 00:51:29 +00:00

telephony/java

am 9017e061: Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev automerge: b600d89

2014-11-04 03:15:41 +00:00

test-runner

am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev

2014-10-30 23:44:09 +00:00

tests

am d00ced98: am b0cb0734: Merge "Track change to Conscrypt"

2014-11-03 18:50:21 +00:00

tools

Fix automerge issue

2014-11-03 20:35:54 -08: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

Renaming Telecomm to Telecom.

2014-09-12 22:16:17 -07:00

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%