| commit | 9f6a7f424fad614fdb991bd978009eb1321c70a6 | [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 | cafd980497fda12924f047869d3e57b6cb8425c4 | |
| parent | b6812a0cf65b4ddfe250ad1d6f47168dc983b025 [diff] | |
| parent | 3b5d686e683b1811ca90e056065dcf3805bb256a [diff] |
Merge commit '3b5d686e' into fix-merge-conflict * commit '3b5d686e': Add checkMobileProvisioning to ConnectivityService. Conflicts: services/java/com/android/server/ConnectivityService.java Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458