tree 6284014f04ccb96323ec831e81e283fcd197a531
parent 5eb45473bda706b7b5f0fba5795f90a06ef64731
parent 5f9defe3f2519865ff9bbc3ae1be405f51d6aab1
author Abhishek Arpure <aarpure@codeaurora.org> 1506678991 +0000
committer android-build-merger <android-build-merger@google.com> 1506678991 +0000

Merge "Integer overflow observed while formatting volume" am: 846f307c6f am: 4a20e8b68f
am: 5f9defe3f2

Change-Id: I014df1d8e0a87ba4fab80b15d5602e3439372c55