commit | 401ef259f3b2c8c87b02c9939c0599d6ad0f6f39 | [log] [tgz] |
---|---|---|
author | Jeff Davidson <jpd@google.com> | Sat Dec 06 02:10:39 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Dec 06 02:10:39 2014 +0000 |
tree | d48082f52576be07fe782e967f87cd1076528c31 | |
parent | c4b2ec1a3a808c2dae0894e5f0cfd43d6ec1d5a2 [diff] | |
parent | a4144563a5bd0e0be4a97fa6e89be6fb455da372 [diff] |
am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev * commit 'a4144563a5bd0e0be4a97fa6e89be6fb455da372': add disable Ephemeral Network API Bug:18525241