tree 482134444c406035177660634e9937b25c78c9c2
parent 2b3b590ff62c432c93d006767409f93ed2c6e53f
parent 112daef624228e4f379f4013bfa45df7a607ecc0
author Jesse Hall <jessehall@google.com> 1490735719 +0000
committer android-build-merger <android-build-merger@google.com> 1490735719 +0000

Merge "Use gralloc usage conversion library" into oc-dev am: 2f44ec6c86
am: 112daef624

Change-Id: I0c21e06d8beb480171b462068d2747c538bca238