tree 517c93a25e6a04eaff18ecc69d67c3c0ebb879b1
parent 3d1df4f411a531fb30cc8563cb39e732041d22ad
parent f5d9360be05d552277364c4a2be04db78726e5f0
author Marco Nelissen <marcone@google.com> 1465427648 +0000
committer android-build-merger <android-build-merger@google.com> 1465427648 +0000

Fix potential overflow am: d0090759e7
am: f5d9360be0

Change-Id: Ia936e59f80f6a24e449d0aee453956e3be29033a