tree 0d840fb561e316d59347d9ea443c2df48183ac24
parent 747781433fb01f745529c7e9dd97c5599070ad0d
parent 28f6c43db54159c218dd2ca27dbb775305b4011c
author Tianjie Xu <xunchang@google.com> 1472753260 +0000
committer android-build-merger <android-build-merger@google.com> 1472753260 +0000

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

Change-Id: I8fb1470e0f7e675c205bffe95c4fb9d0f202e4ed