OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81e62eb 522bd7f)
am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0...
authorRobert Greenwalt <rgreenwalt@google.com>
Mon, 7 Apr 2014 20:26:35 +0000 (20:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Apr 2014 20:26:35 +0000 (20:26 +0000)
* commit '522bd7fb3468bc07133c7ff1a02033dcced740b9':
  DO NOT MERGE Sanitize WifiConfigs


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help