diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-07-13 22:29:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 22:29:46 +0000 |
| commit | 6ede9b679e3313816c11d5d84f3bea679d6f337b (patch) | |
| tree | 0ab118612428d25dab6ae73125de89870e741c04 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 459337c8d41d516d7a85084cf7e7a8f83e14f426 (diff) | |
| parent | 26b0f1e420c0590ea5e9c506f4f14ba4b0a873f0 (diff) | |
am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev
* commit '26b0f1e420c0590ea5e9c506f4f14ba4b0a873f0':
Revert "Finish already paused activity if it should be finished after pausing"
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions