diff options
| author | Dave Langemak <dlangemak@google.com> | 2015-07-31 02:57:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 02:57:24 +0000 |
| commit | b880a036b12c8a8613fbd7fb41328ca93146bf85 (patch) | |
| tree | f3d453494a15b8ab3b303ecd1e2dea783cfd6652 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 135c379115260f672fec023b0f9a020b8c51302b (diff) | |
| parent | 02565c3622aa9007d3d5eb4612f200decd05b55c (diff) | |
am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev
* commit '02565c3622aa9007d3d5eb4612f200decd05b55c':
Make DateTimeView more robust to weird contexts.
Make the RemoteViews context safe for Icons.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions