diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-07-09 00:30:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 00:30:17 +0000 |
| commit | 569a271f0c32a66b33f305e5181c7687b6303aa5 (patch) | |
| tree | 77ecb28545803dcf8b5d941804ac1a35e4ed33b9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 886fd2f5a05a5e36ac20f95c1c06e1716a52c8e9 (diff) | |
| parent | 1fee5522b60d9c24c9b30b5c995e72df191f7d50 (diff) | |
am 1fee5522: am dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
* commit '1fee5522b60d9c24c9b30b5c995e72df191f7d50':
Finish already paused activity if it should be finished after pausing
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions