diff options
| author | Ian Pedowitz <ijpedowitz@google.com> | 2015-08-05 16:55:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-05 16:55:22 +0000 |
| commit | 76b07705585fbe7bf8b744b09ac9f8aa4c8c9b5f (patch) | |
| tree | cf6c0b157bc450b0d3221a70caba0776e9dda44f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c0d2e7a6fb294fcf27039ea0157fbbde17a9b1a1 (diff) | |
| parent | 4d2eec1434f08667999b9cc51e6cf6f7146003e5 (diff) | |
am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
* commit '4d2eec1434f08667999b9cc51e6cf6f7146003e5':
Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions