Deepanshu Gupta f33a2f62a5 am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev ...

* commit 'f5af9a4a9a0c0a3bab43235659e3adfa2cebb52f':
  Fix build due to incorrect merges [DO NOT MERGE]

2014-05-14 00:00:08 +00:00

api

…

cmds

…

core

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

2014-05-13 20:43:18 +00:00

data

…

docs

am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev

2013-07-19 13:02:24 -07:00

drm

…

graphics

…

icu4j

…

include

…

keystore

…

libs

…

location

…

media

am 072e1da2: am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev

2014-03-20 11:11:16 -07:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

…

policy

am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working

2014-04-01 19:43:41 +00:00

samples/training/network-usage

…

sax

…

services

am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev

2014-04-07 20:00:33 +00:00

telephony/java

…

test-runner

…

tests

…

tools

am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build

2014-05-14 00:00:05 +00:00

voip

…

wifi/java/android/net/wifi

am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev

2014-04-07 20:00:33 +00:00

Android.mk

…

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%