tree 8963d6731d91a316e6236103793c2d4e7b25f35c
parent 234703b3a1d2477b38be9402e69652ecaee6ee68
parent 8faf2a2a15853368a14babf935c156664b5f0b6c
author Jeff Davidson <jpd@google.com> 1413388165 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1413388166 +0000

Merge "Don't drop WifiConfiguration's ephemeral bit on copy/parcel." into lmp-mr1-dev