diff options
| author | Daniel Sandler <dsandler@android.com> | 2013-05-30 15:16:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-30 15:16:14 -0700 |
| commit | 2c52b08c3329b6215305316f6465c467abdd4116 (patch) | |
| tree | 2bdf59efa590c46162658be1dc1823c25d4cf53f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 911cdd9959ccc5703897c2b0ba37d619e180ec1c (diff) | |
| parent | 491c607582248590702ce07c0493ff0c39224689 (diff) | |
am 491c6075: am 054255c6: Merge "Unhide action to launch Daydream settings." into jb-mr2-dev
* commit '491c607582248590702ce07c0493ff0c39224689':
Unhide action to launch Daydream settings.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions