Deepanshu Gupta d99dd3e732 am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp ...

* commit '70efbad0648eb96e9becbd0529cc1f34b6ffb986':
  resolve conflicts for merge 5a7b3b65 correctly

2014-05-13 20:54:14 +00:00

api

…

cmds

…

core

am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]

2014-05-13 20:31:33 +00:00

data

…

docs

Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs

2013-07-12 00:50:59 +00:00

drm

…

graphics

Doc update: fix incorrect enum

2013-03-28 16:14:08 -07:00

icu4j

…

include

…

keystore

…

libs

…

location

Android U: Making Apps Location-Aware

2013-05-13 20:50:22 -07:00

media

am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev

2014-03-20 10:47:34 -07:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

…

policy

am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working

2014-04-01 19:18:36 +00:00

samples/training/network-usage

…

sax

…

services

am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs

2014-04-07 19:36:54 +00:00

telephony/java

…

test-runner

…

tests

…

tools

am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

2014-05-13 20:54:12 +00:00

voip

…

wifi/java/android/net/wifi

am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs

2014-04-07 19:36:54 +00:00

Android.mk

Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.

2013-05-06 18:38:24 -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%