app_Settings

Go to file

Antony Sargent 0a7ae11c49 Import translations. DO NOT MERGE

Merge translations of Bluetooth confirmation text

This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.

Bug: 62672248
Test: manual
Change-Id: I43db31f1495e6873b6905896e6fa75fd88b4cb8d

2018-02-13 00:43:21 +00:00

res

Import translations. DO NOT MERGE

2018-02-13 00:43:21 +00:00

src/com/android/settings

Merge "Set device credential's Window flag to be SECURE." into mnc-dev

2017-10-31 22:47:13 +00:00

tests

Import translations. DO NOT MERGE

2016-01-12 16:44:04 -08:00

Android.mk

Allow incremental builds for settings.