commit d61691361839cdcee286fd7b58ed8adc3e32fcf5
author Android Build Merger (Role) <android-build-merger@google.com> Tue Mar 14 16:53:19 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 14 16:53:31 2017 +0000
tree ac93f5e7d019c80fefe18936864c7431d310fd6e
parent 3ee60614af5b4ebec0c4a56e0b3550c3595a32be
parent 3dbbac489b7c7d6620bf974d1c48801ae8619467

Merge changes from topic 'am-660d5927634e486aa0191f76b8cbb641'

* changes:
  Merge changes from topics 'Passpoint API update', 'Passpoint intent update' am: 5df03b3d74 am: 39df78ecc7 am: b81a0cb340  -s ours
  hotspot2: hide validate method for Passpoint configuration am: b5ca6f36b5 am: 9c0f6f3db7 am: a21dbef5fb  -s ours
  Osu: temporarily comment out the usage of deprecated intent definitions am: 06b63dcb9f am: de91bfd277 am: ff5be641ad  -s ours
  hotspot2: update Passpoint intent definitions am: 5679145d9a am: c4d5850d3e am: d26acda230  -s ours