tree b9e15858b1a46c9c2bbfedb29077c9ad70a89d07
parent b8d609eb82ce1849cc767896065a11b4e072abdf
parent 28630218ccf48360501e23f3d21ef16d2d8c366d
author Peter Qiu <zqiu@google.com> 1485919858 +0000
committer android-build-merger <android-build-merger@google.com> 1485919858 +0000

Merge "hotspot2: update PasspointConfiguration APIs" am: 59da9b24ca am: 4ed5fe8191
am: 28630218cc

Change-Id: I264d4664bc9e69d9c70dce7ffcf75e3ae2e2e430