OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0f474d b2dccc4)
am b2dccc41: am d5d61a0a: Merge "Remove wifi scan-always dialog." into jb-mr2-dev
authorRobert Greenwalt <rgreenwalt@google.com>
Mon, 13 May 2013 21:15:41 +0000 (14:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 May 2013 21:15:41 +0000 (14:15 -0700)
* commit 'b2dccc418410cd2c35213fddb5da7dce1d91c47b':
  Remove wifi scan-always dialog.

1  2 
AndroidManifest.xml patch | diff1 | diff2 | blob | history

diff --cc AndroidManifest.xml
Simple merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help