diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-07-09 03:49:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 03:49:38 +0000 |
| commit | 3d34523200cb69f8c13a7a99ad5429edbf0bcc12 (patch) | |
| tree | 04c2fb8f409c8b5b302bd39de8104d16722e3522 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fd1b57263cc07a3a77d2ee076726758bd1d97d36 (diff) | |
| parent | 031b9477663e0974fbc765795ccd7694a0430b5a (diff) | |
am 031b9477: am 348988c5: Merge "Fix permissions on TelephonyManager" into mnc-dev
* commit '031b9477663e0974fbc765795ccd7694a0430b5a':
Fix permissions on TelephonyManager
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions