app_Settings

Go to file

The Android Automerger 3824ac2b49 Merge branch 'master' into honeycomb-release

* master:
  Fix a null pointer exception when disabledSystemIMEs is null.
  Add minTickWidth for the bar chart
  Add a scroll view to proxy settings so that it isn't obscured by the keyboard.
  fix the TooManyDeletes to show up again
  Refactor memory measurement

2010-12-20 07:38:53 -08:00

assets/html

String change - wifi tether = hotspot

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

res

Merge "Add minTickWidth for the bar chart"

2010-12-17 14:56:10 -08:00

src/com/android/settings

Merge "Fix a null pointer exception when disabledSystemIMEs is null."

2010-12-19 19:35:00 -08:00

tests

Rename Indonesian and Hebrew translations to match Locale.java conventions