diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2016-06-02 00:11:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-02 00:11:36 +0000 |
| commit | 7c4986085e94b05398621cb4c0c9a43427ec5f2d (patch) | |
| tree | 6229f2d1443a42f140e8929fcf8005d34719dff0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 98db6f9b60526a41dd9e501da54184e90bc11e73 (diff) | |
| parent | 1c943786ebd68739254b2d35317914da0e78e47a (diff) | |
Merge "Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev am: 13d534e7f2 am: 859465c105" into nyc-mr1-dev-plus-aosp
am: 1c943786eb
* commit '1c943786ebd68739254b2d35317914da0e78e47a':
Don't crash activity manager when supplying invalid URI
Change-Id: Iff3b4c66798a0a18a26d9e4e6facd5d088daa43a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions