diff options
| author | Sid Soundararajan <ssoundar@google.com> | 2016-06-29 20:13:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-29 20:13:54 +0000 |
| commit | aea3d63f852562a6b981b4ac5744560a9fb34e14 (patch) | |
| tree | 14bcaa8ed10b228991fc9b1689bbf901db418da7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a75526bd117a0dbfb9793392cb7d28621829311c (diff) | |
| parent | 10b2fee05f3704ee65cd3730c3d0e2cdb5ac26e2 (diff) | |
Merge \"Recents: Make sure blacklist checks the package name as well as activity name\" into nyc-dev
am: 10b2fee05f
Change-Id: If4ddf850d2be037d50a7aa3ddbce040c7ad4b7cd
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions