diff options
| author | Daniel Sandler <dsandler@android.com> | 2013-05-30 12:36:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-30 12:36:59 -0700 |
| commit | 491c607582248590702ce07c0493ff0c39224689 (patch) | |
| tree | 780754eb9949d2176ef9d8b68037d55425307845 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b2903bc64da3c684376c24cf485e90c9cf0736af (diff) | |
| parent | 054255c6d282a4ab2a95e56859242a2512871296 (diff) | |
am 054255c6: Merge "Unhide action to launch Daydream settings." into jb-mr2-dev
* commit '054255c6d282a4ab2a95e56859242a2512871296':
Unhide action to launch Daydream settings.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions