diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-06-22 12:37:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-22 12:37:26 +0000 |
| commit | 7c6dbddce6e60b0628a35acbded61d3b8691e8a2 (patch) | |
| tree | 1493b090a666feadc09d43dd84c2952e7668e01e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 39c5f9f02067e877eec64a86266129a981bab9f9 (diff) | |
| parent | b60a8ad449ed875f43d8b0325fa9c729e7c17155 (diff) | |
Merge "Merge \\"Don\\'t allow showing an activity if user is stopping or shutting down.\\" into nyc-dev am: 2058553b8d am: f5cf319dc9" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions