diff options
| author | Winson Chung <winsonc@google.com> | 2015-01-13 21:04:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-13 21:04:34 +0000 |
| commit | 1240cc5b445fe461c41c3423ab0bca1736625e9d (patch) | |
| tree | 5ba2900a9eace66c44edee0bd0e7dce0efd6cb67 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fa58f454c177e35f774dec3d2987628fa6359239 (diff) | |
| parent | 2b59fb902eb1f7d65f4a2fcfdaa6ea603d6dd6f0 (diff) | |
Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev automerge: 7ce662e -s ours automerge: b1a0a57 -s ours
automerge: 2b59fb9 -s ours
* commit '2b59fb902eb1f7d65f4a2fcfdaa6ea603d6dd6f0':
DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions