diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-07-14 16:29:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 16:29:40 +0000 |
| commit | efb4a3f6d2f77e6fff62b2c6f83c5c8497dc133c (patch) | |
| tree | db25315de4d47710796d77220abc73fa8a560033 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 68706332e0826591ca59c8a9b34e4b9b5e65c05c (diff) | |
| parent | 061846d19fb29a09b9972a47c94110464e8177d1 (diff) | |
am 061846d1: am ec565efe: am eb2153c7: am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
* commit '061846d19fb29a09b9972a47c94110464e8177d1':
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
