tree c35e5e911dce41d3de697fb12c6c2ccccb16146a
parent 73a648990f0e126af49af5be1049255019d33e12
parent 28495b02f21d208360acae09c57fbd146a53407b
author Primiano Tucci <primiano@google.com> 1412767349 +0100
committer Primiano Tucci <primiano@google.com> 1412767349 +0100

resolved conflicts for merge of 28495b02 into master

Conflicts:
    wifi/java/android/net/wifi/ScanResult.java

Change-Id: I86a4537d603cbf325e5e0bff715a442d9dc6b6db