tree edeb3decf919ef98fdcbe3a666df6de790d58d03
parent 1c6cfdf64392cd0dec26b5e08ea84c4ee935f389
parent 1199a4c436b4e08306c02f615360e233124bff55
author Jeff Davidson <jpd@google.com> 1413389018 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413389018 +0000

am 1199a4c4: am f2a598e4: am 074c5b5b: Merge "Don\'t drop WifiConfiguration\'s ephemeral bit on copy/parcel." into lmp-mr1-dev

* commit '1199a4c436b4e08306c02f615360e233124bff55':
  Don't drop WifiConfiguration's ephemeral bit on copy/parcel.