am 54af78a3: Merge change 5950 into donut

Merge commit '54af78a3f7064e04d7ebd64c985d4149f9f7b05c'

* commit '54af78a3f7064e04d7ebd64c985d4149f9f7b05c':
  Fix memory leaks in system_server

diff --cc location/java/com/android/internal/location/GpsLocationProvider.java
Simple merge

diff --cc services/java/com/android/server/WifiService.java
Simple merge

diff --cc services/java/com/android/server/WindowManagerService.java
Simple merge