| commit | 4573944e96cbe34de6bc549f8f313f070fcb7ace | [log] [tgz] |
|---|---|---|
| author | Sreeram Ramachandran <sreeram@google.com> | Thu Oct 23 22:02:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 22:02:25 2014 +0000 |
| tree | 899f4e60c44fea1bf516972eed092803cbbc8c15 | |
| parent | 08d1c808477d67fe9f0a2d2ad9463998f8d54379 [diff] | |
| parent | b9248a5552dde8bf76db77054ed31a59300fe0cd [diff] |
am b9248a55: am b1df48e4: Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev * commit 'b9248a5552dde8bf76db77054ed31a59300fe0cd': Add an API to select a network for a DatagramSocket.