diff options
| author | Billy Lau <billylau@google.com> | 2015-07-13 23:35:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 23:35:14 +0000 |
| commit | 0be2efb256c6bcac3f9d17319c9af90bbef1010c (patch) | |
| tree | b3f32891348a792966cd503ad8fd834ec5a17b77 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | cf00a86461bb39ca5cb6461cab280aeb4d42bab3 (diff) | |
| parent | f028ba3db3d3b6478154952dbbd8ed7422ad14f6 (diff) | |
am f028ba3d: am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
* commit 'f028ba3db3d3b6478154952dbbd8ed7422ad14f6':
Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
