diff options
| author | Craig Mautner <cmautner@google.com> | 2014-07-31 03:57:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-31 03:57:33 +0000 |
| commit | f37034aca6e04d170a3abd2e9b19dcfd711c4e82 (patch) | |
| tree | 1f70d882c9f1b21c8eec9d3eded010f4c5a12d89 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 638a2b2dac2e5a020693836d910789aee3c14795 (diff) | |
| parent | 905fe15ea09238ed132ccd347e078892b6b49ddf (diff) | |
am 905fe15e: Merge "[ActivityManager] Avoid mistaking visibility by finishing task."
* commit '905fe15ea09238ed132ccd347e078892b6b49ddf':
[ActivityManager] Avoid mistaking visibility by finishing task.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions