| commit | d6459e7bcb9c1e9df6da3fb69346fb07d57655e5 | [log] [tgz] |
|---|---|---|
| author | Anh Nguyen <anguyen@codeaurora.org> | Tue Mar 10 00:45:06 2015 -0700 |
| committer | Anh Nguyen <anguyen@codeaurora.org> | Tue Mar 10 00:45:06 2015 -0700 |
| tree | 38c8561746a1843b7c227c4d27333329861ce86d | |
| parent | 880aea0f9852a0f5afeb48855cfc6b7236cd3a37 [diff] | |
| parent | 5921779b4827551735e9016c6b6a22adf176ec85 [diff] |
Merge tag 'android-5.1.0_r1' into HEAD Android 5.1.0 release 1 Conflicts: service/java/com/android/server/wifi/WifiAutoJoinController.java service/java/com/android/server/wifi/WifiConfigStore.java service/java/com/android/server/wifi/WifiStateMachine.java Change-Id: Ice0deccd16e33e512bf6c0b5ad53f8945303bdfe