tree 8c961fe04ab6f4dcc930a577b49550f3f4f4834f
parent 7b587884baeb98ca13b37f3034bd4e26881252c8
parent 8407968db68f1838663118fd0b23576854b8c525
author Yuhao Zheng <yuhaozheng@google.com> 1401469871 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401469871 +0000

am 5743a516: (-s ours) Merge "DO NOT MERGE - Wifi Passpoint API change" into lmp-preview-dev

* commit '5743a516bbf70be6e5f2db5b1becfb15fa6393b2':
  DO NOT MERGE - Wifi Passpoint API change