diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-07-13 23:33:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 23:33:18 +0000 |
| commit | d91f9c7e996241060a7503461e44e4e6787611dd (patch) | |
| tree | 9ac411a65f1806fbd491fa67706fb7524fe67845 /rs/java/android/renderscript/Program.java | |
| parent | 78c93dfce682cac02f1e61b7c943c19fe5160001 (diff) | |
| parent | 6ede9b679e3313816c11d5d84f3bea679d6f337b (diff) | |
am 6ede9b67: am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev
* commit '6ede9b679e3313816c11d5d84f3bea679d6f337b':
Revert "Finish already paused activity if it should be finished after pausing"
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions