tree b46bdaaf1c6bf72351fe5adc8a194c58a973642a
parent c3336a2917a6ebe0d54e516d41f1a208c5dce1c8
parent ac562839f52ffa3d701078a2ebf3d6dc4c4dc468
author Peter Qiu <zqiu@google.com> 1486515661 +0000
committer android-build-merger <android-build-merger@google.com> 1486515661 +0000

Merge changes from topic 'Passpoint API Rename' am: 93d66c83cf am: 322c9a9ec5 am: 1c8845c6b0
am: ac562839f5

Change-Id: I2d0d4756003ef63fe7cd824d53169ce758d597ab