| commit | 0cc0a44c2fac2fa033dbcd76443c79eb2a0b4f76 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Mon Jul 01 16:12:31 2013 -0700 |
| committer | Wink Saville <wink@google.com> | Mon Jul 01 16:12:31 2013 -0700 |
| tree | ceed73648224f9ef75d3768890e1486b3cda1e2e | |
| parent | d78d557cb86a5796d47b3257da603902ac1a66fa [diff] | |
| parent | 3463b3ff48d3154a194e5ba376b095ae12126eeb [diff] |
Merge commit '3463b3ff' into fix-merge-conflict * commit '3463b3ff': Add checkMobileProvisioning to ConnectivityService. Conflicts: services/java/com/android/server/ConnectivityService.java Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458