Roy West d80ac7ec78 am 83caf0b2: (-s ours) am 82d2908b: do not merge ...

Merge commit '83caf0b26f133e7c07bd712635c789ff678597b0'

* commit '83caf0b26f133e7c07bd712635c789ff678597b0':
  do not merge

2010-10-10 12:52:25 -07:00

assets/html

String change - wifi tether = hotspot

2010-05-08 17:20:26 -07:00

res

resolved conflicts for merge of 10ebf928 to master

2010-10-10 09:05:02 -07:00

src/com/android/settings

Merge "Fix issue with limiting access points"

2010-10-10 12:22:04 -07:00

tests

am 5496db04: am 59091c08: Fix Bluetooth device name max length checking.

2010-09-22 17:05:30 -07:00

Android.mk

Fix proguard flag file dependency.

2010-09-30 13:23:20 -07:00

AndroidManifest.xml

resolved conflicts for merge of 0eb550ef to master

2010-10-10 08:25:21 -07: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

Fragmentize BluetoothSettings.

2010-09-13 16:18:05 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%