diff options
| author | Ariel Gertzenstein <agertzen@google.com> | 2014-04-21 18:50:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-21 18:50:25 +0000 |
| commit | ad7b890f59d0493fb1d011c22721d68e2d22bf38 (patch) | |
| tree | c429aebbffb252569441d46fdb16b9227bf04612 /opengl/java/android | |
| parent | 2146b91404bfe8274bb8b37bfea1d9b8059cdd12 (diff) | |
| parent | 6788110191fc457169d8268a4c25e1845d05ee07 (diff) | |
am 67881101: (-s ours) am fe755054: Merge "DO NOT MERGE Tear down PAN if we can\'t successfully complete a DHCP request after establishing a PANU connection." into klp-modular-dev
* commit '6788110191fc457169d8268a4c25e1845d05ee07':
DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection.
Diffstat (limited to 'opengl/java/android')
0 files changed, 0 insertions, 0 deletions