diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-07-09 04:29:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 04:29:51 +0000 |
| commit | b9ea0a0d5ab3146a1c5631bd6fcf96927d584b88 (patch) | |
| tree | f683ac164ea10d0d6bfc5c71858ee82d71b233b4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ff558a25fd4e028e2c317421fb4f59b749418e7a (diff) | |
| parent | 6bb9ce2c71c95da21e44bf6e02e48b36b792fd9b (diff) | |
am 6bb9ce2c: am 5a38c8e9: am 3d345232: am 031b9477: am 348988c5: Merge "Fix permissions on TelephonyManager" into mnc-dev
* commit '6bb9ce2c71c95da21e44bf6e02e48b36b792fd9b':
Fix permissions on TelephonyManager
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions