tree 46c1f3791f727fcf5c9a7ca9bbe49590684bb404
parent 49b653357a0187934be3d96f514f6d301d23d77c
parent a617486fd9ffd7e645465a10d8aa2e1358daf25c
author Dan Albert <danalbert@google.com> 1500500629 +0000
committer android-build-merger <android-build-merger@google.com> 1500500629 +0000

Merge "Use int32_t instead of off_t when necessary." am: cf6eb0a136 am: 5c38332e6b am: 088db676d6
am: a617486fd9

Change-Id: I5cedd6d7fa82bb7f24c005cb656184c3b2a7ff03