diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-12 14:12:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 14:12:25 -0700 |
| commit | 72a6af1ab13fbcb98598b0e11b0bb3b069d30635 (patch) | |
| tree | c1d44d7cacbc3d72a63015b1426ba986085c3b40 /graphics/java/android/renderscript/ProgramStore.java | |
| parent | 63ece47fecdb5932de9af5cfec4cf998764e6e0a (diff) | |
| parent | 7d9526445c8631f347c7bf7d944e5bb1dc35b0b5 (diff) | |
am 7d952644: merge from open-source master
Merge commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5' into kraken
* commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5':
Support to display message when operation is blocked due to FDN being enabled
Diffstat (limited to 'graphics/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions