diff options
| author | Billy Lau <billylau@google.com> | 2015-07-14 00:21:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 00:21:42 +0000 |
| commit | cb2a7a2cc48253e8fe941322f4b59b8e2125eae8 (patch) | |
| tree | c58d6e6427f601f9071cf4f3832fe6508e5a67b7 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | b5468cbf3060d2b7d6909e1cbaac18beb61e7111 (diff) | |
| parent | 0be2efb256c6bcac3f9d17319c9af90bbef1010c (diff) | |
am 0be2efb2: am f028ba3d: am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
* commit '0be2efb256c6bcac3f9d17319c9af90bbef1010c':
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