OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95798d2 924ff03)
am 924ff036: (-s ours) am 44a3cb5c: Merge "Fix on/off switch for Android Beam." into...
authorMartijn Coenen <maco@google.com>
Wed, 12 Sep 2012 22:28:42 +0000 (15:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Sep 2012 22:28:42 +0000 (15:28 -0700)
* commit '924ff0366a044e6c2dbe7bd926406bf22ed0baa2':
  Fix on/off switch for Android Beam.


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help