tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 87747234235f3c7fb590faf51389517e239b586d
parent 5e3a40f934ca7d435496dfacf00b7909d3b3d98d
author Tao Bao <tbao@google.com> 1440684838 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684838 +0000

am 5e3a40f9: am 304c65b8: (-s ours) am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"

* commit '5e3a40f934ca7d435496dfacf00b7909d3b3d98d':