| commit | 7ac1ec43436ecd69452abfb0dae0ad22a3a5130c | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Dec 05 22:40:28 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:40:28 2013 +0000 |
| tree | adb64c650885008a1b21eaedbeb3b9fc778f44aa | |
| parent | c2890d4fffc4129da8fb115b5906b90896d3fe44 [diff] | |
| parent | 47dc5a34b9d861e45171591050ee9ee8248031a4 [diff] |
am 47dc5a34: (-s ours) am 8eec0cbe: am 292a92e3: am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev * commit '47dc5a34b9d861e45171591050ee9ee8248031a4':