tree dcd1afa19fe03abca98af492e55704a4c61237d5
parent 844c74a7501b9265e16e25a8ca5286a2f6539d55
parent 619653d7b1f65a48cb0698532296b7b7ce5f9b69
author Josh Gao <jmgao@google.com> 1514507388 +0000
committer android-build-merger <android-build-merger@google.com> 1514507388 +0000

Merge "Don't TEMP_FAILURE_RETRY on close." am: e1c003dc11 am: 7f4b73fb1a
am: 619653d7b1

Change-Id: I1f896a59da33be27a5d81362a6a1897f0ec277cf