| commit | d5166504954f4e26845d26a9410cd798657a12d5 | [log] [tgz] |
|---|---|---|
| author | Kris Giesing <kgiesing@google.com> | Wed Apr 22 17:51:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 22 17:51:12 2015 +0000 |
| tree | 1b9b84448aa0247856f56c6dcc232c03f660c11c | |
| parent | 834678ed8b2b300f22ab69d46f14a21d543b8f31 [diff] | |
| parent | 2a0c4a3ae091c4a922a1dec040a56c2edcc5e588 [diff] |
am 2a0c4a3a: (-s ours) am 6cf2d35d: (-s ours) Merge "DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"" into lmp-mr1-ub-docs * commit '2a0c4a3ae091c4a922a1dec040a56c2edcc5e588': DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"