tree a10774c07a79a9c170f97048a48ba81e7b1d2e00
parent 409c087ffe6aa79d943e0ed18593df19967f81d5
parent 10155def9a1d617a8011c8017c1eb3a2e164fdd0
author Wei Wang <wvw@google.com> 1476982644 +0000
committer android-build-merger <android-build-merger@google.com> 1476982644 +0000

Merge "Fix log function for potential overflow" am: 2e5c7798e1
am: 10155def9a

Change-Id: Ia91d711168bf9e69c583b1a933d69de94916b449