tree 8acc1da89becaf49e89c69d00b3f7e7cb7e1771a
parent 902cc578a440eb957bc5ef387b8fd0f1c0640bff
parent 820ba1f96f5917db98df5b5d36cf5f4b32f50f59
author Jeff Davidson <jpd@google.com> 1418086829 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418086829 +0000

am 820ba1f9: am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev

* commit '820ba1f96f5917db98df5b5d36cf5f4b32f50f59':
  add disable Ephemeral Network API Bug:18525241