tree c504bb11f1425b3679d93f015b84cd8536251287
parent ec0fc6394e5abd1dbd47fe58d2988b997bac60dc
author Andrew Hayden <andrewhayden@google.com> 1463049642 +0100
committer Andrew Hayden <andrewhayden@google.com> 1463049642 +0100

Sync to 8ffe39d965862e3659c68208efa9147adcaea3bb.

This pulls in a bugfix that is needed by Phonesky:
https://github.com/andrewhayden/archive-patcher/issues/6

BUG=26179455

Change-Id: I5e26e7640c8a9383baf780d379ef25c99f5e08f1