diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-09-06 21:49:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-06 21:49:49 +0000 |
| commit | 60e7810886e77d2d8c88159fe05978ec9f6e7ca4 (patch) | |
| tree | c7695885568cad8b8acfff797fb4c1957f961a74 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 2ae9e260bbc3535c678467efd101382eb14a9067 (diff) | |
| parent | 4ebf51125eb35ed033f89c83ab6c9d8f08bc040c (diff) | |
Merge changes from topic 'am-620401011b0647ba99518f69310512c1' into nyc-mr1-dev-plus-aosp
* changes:
Merge "Fix receive timeout on LocalSocket" into nyc-mr1-dev am: e3e952148c am: f060c06aec
Fix receive timeout on LocalSocket am: 8d5ec8d7db am: ad54b35d6d
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions