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