diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-05-27 03:23:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-27 03:23:40 +0000 |
| commit | 68f4e9fbb21d69e963bec22fd4c50721b3e400f9 (patch) | |
| tree | 3ab0845256f4a154ee6a513cd936ae083b3d77b0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | eacf998c561a5342fb104c4e478abb3e0df969f1 (diff) | |
| parent | 0ce1648f016e96cd7a496753b86d16f78795930a (diff) | |
Merge changes from topic \'am-e4ceb878ab564c70a4e1726ee7c0709a\' into nyc-mr1-dev
am: 0ce1648f01
* commit '0ce1648f016e96cd7a496753b86d16f78795930a':
Suppress unlock notifications on non-FBE devices.
Replace caribou wallpaper without the stars b/28339724
Change-Id: I05bc48ae343e57be43e88dafc538a3dfe77ff37a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions