app_Settings

Go to file

Martijn Coenen 924ff0366a am 44a3cb5c: Merge "Fix on/off switch for Android Beam." into jb-mr1-dev

* commit '44a3cb5cb81e40cc7b06b783bf4bd6ccd46452df': (30 commits)
  Fix on/off switch for Android Beam.
  Revert "Import translations. DO NOT MERGE"
  Import translations. DO NOT MERGE
  Revert "Import translations. DO NOT MERGE"
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Revert "Import translations. DO NOT MERGE"
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  ...

2012-09-11 14:46:06 -07:00

res

am 43a5c62c: am a47a3c8d: Merge "Fix color of text in widget picker" into jb-mr1-dev

2012-09-10 18:27:29 -07:00

src/com/android/settings

Merge "Fix on/off switch for Android Beam." into jb-mr1-dev

2012-09-11 14:43:57 -07:00

tests

am f587f5a5: am 78f5c4d5: am 76ddf411: Merge "Fix /proc/version parsing in Settings."

2012-09-10 19:05:37 -07:00

Android.mk

Use telephony-common