tree 44e525c62cf2298767a86545a1810ead2abc6465
parent 0a247732a55917b6694e3813bedeeb5299c53ec8
parent 3f57a273d2f192807f505749cefaf5393f9586bb
author Peter Qiu <zqiu@google.com> 1490310812 +0000
committer android-build-merger <android-build-merger@google.com> 1490310812 +0000

Merge "Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data" am: 44ef19d131 am: aadbb2d45e" into nyc-mr2-dev-plus-aosp
am: 3f57a273d2

Change-Id: Ie314289ce69f07c872c7a16ddc90d36be25c777f