diff options
| author | Wink Saville <wink@google.com> | 2013-07-01 16:12:31 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2013-07-01 16:12:31 -0700 |
| commit | 9f6a7f424fad614fdb991bd978009eb1321c70a6 (patch) | |
| tree | cafd980497fda12924f047869d3e57b6cb8425c4 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| 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
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions