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