Calvin On a91e5368f0 resolve merge conflicts of f17c1d488840 to master ...

OCL: http://ag/1932572

Test: refactoring CL, with unit tests

Change-Id: I5da27ee70afb8bf6e5fe9f6f3b545cd26d5c8d20

2017-02-22 15:36:53 -08:00

apct-tests/perftests

…

api

Merge "Unhide root MIME type."

2017-02-22 19:45:48 +00:00

cmds

Merge "Log pm install time and package name"

2017-02-21 21:01:20 +00:00

core

Merge "Revert "Ensure network connectivity on app start.""

2017-02-22 22:47:56 +00:00

data

…

docs

…

drm

…

graphics

Graphics: Make SurfaceTexture compile-time initializable

2017-02-20 16:18:24 -08:00

keystore

…

legacy-test

…

libs

underline is now only tracked by android

2017-02-22 10:49:51 -05:00

location

…

media

Merge "bluetoothmidiservice: fix timestamp for BLE-MIDI transmitted packets"

2017-02-22 03:03:30 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Don't show the percentage twice when charging."

2017-02-22 21:11:34 +00:00

proto

Add metrics for default assist/voice input pickers

2017-02-21 11:20:46 -08:00

rs

…

samples/training/network-usage

…

sax

…

services

resolve merge conflicts of f17c1d488840 to master

2017-02-22 15:36:53 -08:00

telecomm/java

Merge "Introduce APIs for RTT calls (part 1)" am: 27ad05169e am: d83b06cd31

2017-02-22 19:05:03 +00:00

telephony/java

Merge "Mark some system intents as SystemApi"

2017-02-22 03:07:46 +00:00

test-runner

Merge "Remove conflicting package information for junit.runner and junit.textui" am: f3f4775a35 am: 9b5522f8c4

2017-02-22 15:31:55 +00:00

tests

AAPT2: Shared library support

2017-02-22 11:16:13 -08:00

tools

AAPT2: Rename strip phase to optimize

2017-02-22 11:41:55 -08:00

wifi

Merge "[AWARE] Remove enableUsage/disableUsage API" am: 647f2e1493 am: 8e32c1b718

2017-02-17 22:36:42 +00:00

Android.bp

…

Android.mk

Merge "Overhaul GraphicsStatsService"

2017-02-21 19:23:46 +00:00

CleanSpec.mk

…

compiled-classes-phone

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

PREUPLOAD.cfg

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%