| commit | 0f422c6d8024fb682d2e30a77ae7cf9c9c456cff | [log] [tgz] |
|---|---|---|
| author | Primiano Tucci <primiano@google.com> | Wed Oct 08 12:22:29 2014 +0100 |
| committer | Primiano Tucci <primiano@google.com> | Wed Oct 08 12:22:29 2014 +0100 |
| tree | c35e5e911dce41d3de697fb12c6c2ccccb16146a | |
| parent | 73a648990f0e126af49af5be1049255019d33e12 [diff] | |
| parent | 28495b02f21d208360acae09c57fbd146a53407b [diff] |
resolved conflicts for merge of 28495b02 into master
Conflicts:
wifi/java/android/net/wifi/ScanResult.java
Change-Id: I86a4537d603cbf325e5e0bff715a442d9dc6b6db