frameworks_base

Go to file

Chih-hung Hsieh b21f69181f Merge "Fix misc-macro-parentheses warnings in DngCreator." am: d439efc361 am: cfae35a400 am: 86f5b560af

am: 1099ea59c5

* commit '1099ea59c575f4445364359cfa74d9afb6d1dd4d':
  Fix misc-macro-parentheses warnings in DngCreator.

Change-Id: I7ddd16cdf438ab53726ea546c86e6f9e9b6027ce

2016-05-27 23:37:43 +00:00

api

resolve merge conflicts of 8de7c95 to master

2016-05-27 16:10:34 -07:00

cmds

Merge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7

2016-05-24 21:41:32 +00:00

core

Merge "Fix misc-macro-parentheses warnings in DngCreator." am: d439efc361 am: cfae35a400 am: 86f5b560af

2016-05-27 23:37:43 +00:00

data

Merge "Additional alarm sounds for N" into nyc-dev

2016-04-28 22:24:11 +00:00

docs

Merge "Doc change: Fix broken link." into mnc-io-docs am: d643ab1ddb

2016-05-27 17:57:50 +00:00

drm

Discourage use of "_data" column.

2016-01-06 10:19:35 -07:00

graphics

Merge commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611'

2016-05-27 20:05:56 +00:00

include

Performance improvements in AssetManager

2016-05-20 15:04:09 -07:00

keystore

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

libs

Merge "Add lock-clocks script for bullhead/angler"

2016-05-26 20:52:05 +00:00

location

Adding SBAS offset to Gps/Gnss SvStatus converter

2016-05-24 09:25:02 -07:00

media

Merge "Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am: d34d06606d am: 29e8879307" into nyc-mr1-dev-plus-aosp

2016-05-27 17:14:11 +00:00

native

Merge "resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp am: 85e0c89ba5" into nyc-mr1-dev-plus-aosp

2016-04-28 19:46:13 +00:00

nfc-extras

…

obex

…

opengl/java

Make surfaceRedrawNeeded forgiving

2016-04-18 13:26:48 -07:00

packages

Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into nyc-dev am: f8c504db7f am: 9e78ee80b8

2016-05-27 23:35:41 +00:00

proto

resolve merge conflicts of cd9ea74 to nyc-mr1-dev am: 7ee8418076

2016-05-27 23:35:34 +00:00

Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev

2016-05-19 22:24:27 +00:00

samples/training/network-usage

…

sax

…

services

Merge "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev am: aabbfc5565

2016-05-27 23:35:36 +00:00

telecomm/java

Merge "Remove PROPERTY_WORK_CALL" into nyc-dev

2016-05-23 17:26:45 +00:00

telephony/java

resolve merge conflicts of 4c04097 to nyc-mr1-dev

2016-05-26 23:13:17 +00:00

test-runner

Un-deprecated Android mock testing APIs

2016-05-25 22:54:27 +00:00

tests

Merge commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611'

2016-05-27 20:05:56 +00:00

tools

Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca5640c am: 9bb16a480d

2016-05-25 17:32:33 +00:00

wifi/java/android/net/wifi

[NAN] Add retry count for transmitting L2 NAN messages

2016-05-24 01:28:04 +00:00

Android.mk

Merge "Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c am: c25a9b0104 am: 4569e9515c am: 48d8747041" into nyc-mr1-dev-plus-aosp

2016-05-02 19:48:56 +00:00

CleanSpec.mk

Fix incremental build

2016-03-03 10:19:27 -08:00

compiled-classes-phone

Frameworks/base: Add compiled-classes

2016-04-26 19:14:52 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Frameworks/base: Add holder to BaseBundle

2016-04-19 20:46:43 -07:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%