tree ff85f7e43bcfcbf4c6b41b56c46a409adfd8835d
parent 04ef282253db678ad59430a452af3aea2badfcf0
parent 47585f462a9cde661169b16cea870c05e91d92f8
author Erik Kline <ek@google.com> 1434428247 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434428247 +0000

am 47585f46: am a01b9e6f: am 0d16281a: Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev

* commit '47585f462a9cde661169b16cea870c05e91d92f8':
  Add a test that Network#getNetworkHandle() behaves sanely.