diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-07-02 18:56:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-07-02 18:56:52 +0000 |
| commit | f07c01e70e8ab24bd42bfe854afea9d1a1f18333 (patch) | |
| tree | 5432f0d8750c6fe309f0511610999c35ac05569f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | da9fbb48f469778b2d8d6bc42231c0c55319f819 (diff) | |
| parent | 879542402c4e15f0e4485ec7445d07cbf6e66d12 (diff) | |
Merge "[automerger skipped] Prevent system server crash while start activity failed. am: 380626cf54 am: 4c2600abe1 -s ours am: 4879ec82db -s ours am skip reason: change_id I7949dc1effcc171834f6bc3ff0333f9090b58480 with SHA1 380626cf54 is in history"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions