commit | 820ba1f96f5917db98df5b5d36cf5f4b32f50f59 | [log] [tgz] |
---|---|---|
author | Jeff Davidson <jpd@google.com> | Mon Dec 08 19:36:33 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 08 19:36:33 2014 +0000 |
tree | bc897054db7cba469e1344d4eac4962b81a584fb | |
parent | d4753450f37d88fec11d1405250529ca794ae70c [diff] | |
parent | 401ef259f3b2c8c87b02c9939c0599d6ad0f6f39 [diff] |
am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev * commit '401ef259f3b2c8c87b02c9939c0599d6ad0f6f39': add disable Ephemeral Network API Bug:18525241