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