diff options
| author | Winson Chung <winsonc@google.com> | 2015-11-13 18:37:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-13 18:37:15 +0000 |
| commit | 28fc76ecef04061bfdbad2f5dc52bc1d5daf0e0d (patch) | |
| tree | c45147de4e3d7a9c29b49de3916f9d6f44cdb600 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1b29fd87a26d6230c55c701d1411b34342614af0 (diff) | |
| parent | ef15ca85d7f847884e391e3283daabb019e44e10 (diff) | |
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec
am: ef15ca85d7
* commit 'ef15ca85d7f847884e391e3283daabb019e44e10':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions