commit | 050759d4e3eb90cae51fea6636e9337b6c7ea83d | [log] [tgz] |
---|---|---|
author | Nancy Chen <nancychen@google.com> | Mon Jul 06 19:01:55 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 06 19:01:55 2015 +0000 |
tree | 2ac45b3c3a5a2b1292bf4d9be4c0a9cfd1df4c97 | |
parent | 26d555036158fbeaa0baf8d75e1740d96c738add [diff] | |
parent | 00af63a3540628acd652067dcc77729af8326871 [diff] |
am 00af63a3: am d9940d9e: am edf84da1: Merge "Use the network when generating the InetAddress." into mnc-dev * commit '00af63a3540628acd652067dcc77729af8326871': Use the network when generating the InetAddress.