tree d5cc2cb8399953ed7826833a159c38c86c350400
parent 7570e73a9229eb76765f7489e571642b93ef5a2f
parent 3b4e2ebf2c0b2a0ccada1e6e42937ffead1011fb
author Dan Willemsen <dwillemsen@google.com> 1508794851 +0000
committer android-build-merger <android-build-merger@google.com> 1508794851 +0000

Merge "libdrm_platform is now libdrm" am: d830858952
am: 3b4e2ebf2c

Change-Id: I4199c9f74bec5783c54a9d387e7d376595fb0d72