OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53691e3 3e604b1)
am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7...
authorRobert Greenwalt <rgreenwalt@google.com>
Mon, 7 Apr 2014 20:16:15 +0000 (20:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Apr 2014 20:16:15 +0000 (20:16 +0000)
* commit '3e604b1198fcab0e3bf2fd29043e4172193db2b5':
  DO NOT MERGE Sanitize WifiConfigs


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