Matthew Xie 4f9fa80d37 am 85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946" ...

* commit '85fb88ee10c6bb901d30e50038b4a86252ff8c68':
  HTML injection fix for bluetooth pairing, issue 65946

2014-03-11 18:16:34 +00:00

res

am a8e634ca: am 104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev

2014-03-08 06:24:57 +00:00

src/com/android/settings

am 7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""

2014-03-11 18:16:11 +00:00

tests

Import translations. DO NOT MERGE

2013-05-08 11:07:07 -07:00

Android.mk

The Settings app needs privileged permissions

2013-06-17 11:43:23 -07:00

AndroidManifest.xml

am 0223f9c5: Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change"

2014-03-11 00:38:26 +00:00

CleanSpec.mk

Add an empty CleanSpec.mk

2010-03-08 18:05:08 -08:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

proguard.flags

NFC payment settings.

2013-08-06 19:16:54 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%