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

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

Change-Id: I2d730fbb2f21b8964b05e5ef79e2367cc95319be