| commit | 6e0a3a48466ea80f9236ecf834bd56b311a6587c | [log] [tgz] |
|---|---|---|
| author | Sreeram Ramachandran <sreeram@google.com> | Thu Oct 23 22:17:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 22:17:28 2014 +0000 |
| tree | 8fd1811cfbfcac13ebf1fea532372f5f904b7bf6 | |
| parent | 4b2a13916c7a5b52d0a2f00745930b2e3def0689 [diff] | |
| parent | 4573944e96cbe34de6bc549f8f313f070fcb7ace [diff] |
am 4573944e: am b9248a55: am b1df48e4: Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev * commit '4573944e96cbe34de6bc549f8f313f070fcb7ace': Add an API to select a network for a DatagramSocket.