| commit | 9c51583dafdbfeb7e005e12dd646e4395cf7a537 | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Wed Apr 27 09:40:06 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 27 09:40:08 2016 +0000 |
| tree | 9c364ff26042f515a4980bb999ff5b32a544f1bd | |
| parent | 6e5b602552b15ab95dc7b1e4e824f8da6a951fcf [diff] | |
| parent | 741b15dc759e8ffc1f9e1f9f120c72c25ce021e5 [diff] |
Merge "IpManager: add a provisioning timeout option" into nyc-dev