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