tree 299523b07fd334d96e5b4c84e4ea1c0b860a2f80
parent c2613eb78b06265379f901a6f456747aef2e5c3c
parent 4d97f36abd208230b0f3c591af0619f3cc96c533
author Nicolas Capens <capn@google.com> 1502809316 -0400
committer Nicolas Capens <capn@google.com> 1502809316 -0400

Merge commit '4d97f36abd208230b0f3c591af0619f3cc96c533' into cloud-android-current-release

Merges in changes from the master branch. Includes support for the
gralloc1 mapper added since Android Nougat MR1.

Change-Id: I91110312412ee7acacfd3ebfeecd7de412f09df2