tree 7f25f42263857f91cb7cd00275a7e38f4c7ae8b1
parent a331d858067bf5b57fddaf3bef2ce2d7c11f116a
parent 852ae8d0fb01cd8939612590417b28b2436c669f
author Tianjie Xu <xunchang@google.com> 1472752508 +0000
committer android-build-merger <android-build-merger@google.com> 1472752508 +0000

Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4
am: 852ae8d0fb

Change-Id: I1ff21b583748136119ee98137c13fa3ee7a0ecc7