The Android Open Source Project b8547bf12c am 9f78ffb2: am 615f8446: reconcile main tree with open-source eclair ...

Merge commit '9f78ffb27e8f6a9de6a9db1d04887cf1eedfff81'

* commit '9f78ffb27e8f6a9de6a9db1d04887cf1eedfff81':
  android-2.1_r1 snapshot

2010-02-05 14:22:33 -08:00

res

First pass at USB-only tether settings.

2010-02-04 09:17:41 -08:00

src/com/android/settings

Merge "Fix device administrator "add" logic"

2010-02-05 10:47:04 -08:00

tests

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:59 -08:00

Android.mk

Do not use a user tag on apps, as it is ignored.

2010-01-05 16:29:09 -08:00

AndroidManifest.xml

First pass at USB-only tether settings.

2010-02-04 09:17:41 -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

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%