Colin Cross bf015232e9 Fix error in translated string ...

This error has been fixed correctly with imported translations
in dev branches, but those changes get skipped when automerging
to the *-plus-aosp branches.  Manually fix the errors.

Bug: 135617299
Test: m SystemUI
Change-Id: I8fa1903d5bd862d30aae62df3d7f40da6f0821f2
Merged-In: Ib5716af725f929fab433a763ae31b47e0cd0befe

2019-06-26 13:10:13 -07:00

apct-tests/perftests

Lazy-load textclassifier settings.

2019-05-02 12:55:58 +01:00

api

move short code definitions to SmsManager Test API

2019-06-24 21:12:48 +00:00

cmds

Merge "Add atom for per-process system ion heap size" into qt-dev

2019-06-24 15:28:29 -07:00

config

Merge "Update boot image profile" into qt-dev

2019-06-20 17:13:19 -07:00

core

Merge "Route KernelWakelockReader's userspace native wakelock stats collection to SystemSuspend (ISuspendControl::getWakeLockStats())" am: a1cae83560

2019-06-26 12:40:23 -07:00

data

Keylayout for xbox pdp controller

2019-06-24 14:41:51 -07:00

docs

…

drm

…

graphics

Merge "Fix ColorStateListDrawable bounds handling" into qt-dev

2019-06-20 11:03:28 -07:00

keystore

Fix encryption/decryption of large blocks.

2019-05-24 09:39:50 -06:00

libs

Move off ZipString and over to std::string/std::string_view as appropriate.

2019-06-17 16:47:58 +00:00

location

Merge "Restore GpsStatus listeners" into qt-dev

2019-05-23 23:42:15 +00:00

lowpan

…

media

Merge "Revert "libmedia_jni pulls in libsfplugin_ccodec"" into qt-dev

2019-06-24 13:04:36 -07:00

native

Handle NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY flag in ASurfaceTransaction

2019-05-23 09:09:09 +00:00

nfc-extras

…

obex

…

opengl/java

…

packages

Fix error in translated string

2019-06-26 13:10:13 -07:00

proto

Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev

2019-06-24 17:36:17 -07:00

rs

…

samples/training/network-usage

…

sax

…

services

Merge "Fix a potential crash when calculate system gesture exclusion" into qt-dev

2019-06-26 02:06:23 -07:00

startop

Merge "[startop] Add an app for testing startup performance" am: e563643312

2019-06-19 15:03:36 -07:00

telecomm

Support indicating call direction on existing connections.

2019-06-25 13:48:29 -07:00

telephony

Merge "move short code definitions to SmsManager Test API"

2019-06-25 17:18:46 +00:00

test-base

Merge "Export some api files for use by cts/tests/signature tests" am: 0a45ac2928

2019-06-03 08:15:50 -07:00

test-legacy

…

test-mock

Merge "Export some api files for use by cts/tests/signature tests" am: 0a45ac2928

2019-06-03 08:15:50 -07:00

test-runner

Merge "Export some api files for use by cts/tests/signature tests" am: 0a45ac2928

2019-06-03 08:15:50 -07:00

tests

Only show "Connected" note after opening portal

2019-06-26 01:55:51 +00:00

tools

Merge changes Ie70d0155,I0692a91d,I8c5041a4 am: 4507201da5

2019-06-21 13:52:40 -07:00

wifi

[AWARE] recommend use Builder create instance in doc

2019-06-25 17:57:37 -07:00

.gitignore

…

Android.bp

Merge "Route KernelWakelockReader's userspace native wakelock stats collection to SystemSuspend (ISuspendControl::getWakeLockStats())" am: a1cae83560

2019-06-26 12:40:23 -07:00

Android.mk

…

CleanSpec.mk

InProcessNetworkStack requires platform-signed APK

2019-05-22 11:02:12 +09:00

jarjar_rules_hidl.txt

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

PREUPLOAD.cfg

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%