app_Settings

Go to file

Atanas Kirilov 84d1cc06ea Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into nyc-mr1-dev

* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
  Merge translations of Bluetooth confirmation text

2018-06-04 20:24:37 +00:00

res

Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207

2017-12-05 17:26:51 +00:00

src/com/android/settings

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc

2018-04-02 17:48:45 +00:00

tests

Fix phishing attack in ChooseLockGeneric

2017-05-15 17:52:44 +00:00

Android.mk

Create feature factory interface & initial impl.