diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-07-09 00:41:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 00:41:25 +0000 |
| commit | a7bdd2f9ed41c6a12d26cdaf4cc4e5bcb32420b4 (patch) | |
| tree | bbb1d01234faae32a7e259783e6947013d15a7a8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c72a582138c1db297c662e5f83ce6a2e97f8bf69 (diff) | |
| parent | 569a271f0c32a66b33f305e5181c7687b6303aa5 (diff) | |
am 569a271f: am 1fee5522: am dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
* commit '569a271f0c32a66b33f305e5181c7687b6303aa5':
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