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