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