diff options
| author | Amith Yamasani <yamasani@google.com> | 2015-07-24 19:47:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 19:47:39 +0000 |
| commit | 8582f9f7591382e360ff9c2e93ea29c3fe65efde (patch) | |
| tree | 5bc3373072c3567a8627c1f075ac6a32579b455b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 71b4c04944b3fc7baa5e607cfd31ebc8cfef1abc (diff) | |
| parent | 21b0b3ac436262a01d7e7c42fb48a758a2a0bbe8 (diff) | |
am 21b0b3ac: am 2c5aeeaa: Merge "Require permission for internal broadcast" into mnc-dev
* commit '21b0b3ac436262a01d7e7c42fb48a758a2a0bbe8':
Require permission for internal broadcast
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions