| commit | 2e63bb7ef508e8c0e5be73a7db17c43d8e58c8b4 | [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 | 25f5af234f1279ad329595146d154a53b21a2e6b [diff] | |
| parent | 68513498e77fc03b5dfa2071b022de7d2273fe70 [diff] |
Merge commit '68513498' into fix-merge-conflict * commit '68513498': Add checkMobileProvisioning to ConnectivityService. Conflicts: services/java/com/android/server/ConnectivityService.java Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458