tree b4fb16a65dcd18baa7bf52c99fbc6d83dcfefda5
parent 8fb315b17be3c9642dd6ebb01d08b32fa5def24b
parent 2747eb7e94bbc393f8a1583fb2af43610c6b9c79
author Todd Kennedy <toddke@google.com> 1468248708 +0000
committer android-build-merger <android-build-merger@google.com> 1468248708 +0000

Merge \\"Solve the infinite loop on clearExternalStorageDataSync\\" am: 9a3fbe1162
am: 2747eb7e94

Change-Id: I56e12f9609c5b511c65a6e6b32dbc7ab1d80958a