diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2015-07-14 18:12:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 18:12:59 +0000 |
| commit | 336f18ba2873935c892b693509d5ae7c7696aeb9 (patch) | |
| tree | 0317e3e9a44b3e0a0961b401ccd91473d2bc6188 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5086a970e786ac4629f5f275a5df25f6e24e1f61 (diff) | |
| parent | 51b4e97ae42fb789b7d1c9d4134ddaa7e2b27b11 (diff) | |
am 51b4e97a: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev
* commit '51b4e97ae42fb789b7d1c9d4134ddaa7e2b27b11':
Add checks for READ_PRIVILEGED_PHONE_STATE.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions