| commit | f1de9d7315f2500d48c09304351c1ab0613a2c83 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Jun 04 09:59:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 04 09:59:04 2015 +0000 |
| tree | 26b57f7fcd8b0d449eb64ab06ab4726267d00f62 | |
| parent | 48c21f472b68b3312c73428ed3cbcd274ec50405 [diff] | |
| parent | a5bbfc610264257cc64e4be7ecc94a8c4b6f32be [diff] |
am a5bbfc61: am b988a080: Merge "Actually fall back from yiaddr to ciaddr." into mnc-dev * commit 'a5bbfc610264257cc64e4be7ecc94a8c4b6f32be': Actually fall back from yiaddr to ciaddr.