git.osdn.net Git - android-x86/packages-apps-Settings.git/commitdiff

author	Martijn Coenen <maco@google.com>
	Tue, 11 Sep 2012 21:46:06 +0000 (14:46 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 11 Sep 2012 21:46:06 +0000 (14:46 -0700)

* 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
  ...

Trivial merge