tree 163a359ec20b9dfe12a3b517d21d09cdc957cd53
parent 2c235f758aa9a03bf58f7e6cde3b85e44911a8f6
parent 49d287133dd68c8764b82390bb0b33f3e662a49b
author David Benjamin <davidben@google.com> 1476862347 +0000
committer android-build-merger <android-build-merger@google.com> 1476862347 +0000

Merge "Fix trivial warning in jpegutil.h." am: f16c21a499
am: 49d287133d

Change-Id: I9d29369da6c7bf0ef0681f0b09c85097b83bfebd