Ian Rogers d73ff581f3 Fix two confusing naming issues ...

android.R.string.yes is not "Yes" but "OK"; prefer android.R.string.ok for clarity
android.R.string.no is not "No" but "Cancel"; prefer android.R.string.cancel for clarity
Found by Error Prone.
Bug: 27723540

Change-Id: Ia6f58a7e7543ad1cc4e4722de8d095d1de8df034

2016-05-27 14:40:59 -07:00

api

resolve merge conflicts of 4c04097 to nyc-mr1-dev am: 04c35e78db

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

cmds

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

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

core

Merge commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611'

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

data

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

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

docs

Merge "docs: Refinements for testing" into mnc-io-docs am: 9da0730d66

2016-05-26 23:09:40 +00:00

drm

…

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

…

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

…

packages

Fix two confusing naming issues

2016-05-27 14:40:59 -07:00

proto

resolve merge conflicts of 0f97b8f to nyc-mr1-dev am: 5b3b72e7b7

2016-05-27 02:46:52 +00:00

rs

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

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

samples/training/network-usage

…

sax

…

services

Merge commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611'

2016-05-27 20:05:56 +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

…

compiled-classes-phone

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%