Merge changes Id437e220,I9d6b3fba
authorKenneth Graunke <kenneth.w.graunke@intel.com>
Mon, 11 Sep 2017 19:36:02 +0000 (19:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Sep 2017 19:36:02 +0000 (19:36 +0000)
commit8a7aa6197d02e15f0d647baa7d7d6fc7645cff9f
treedb3042b672ecdbe3134e4cc0afde9039c314fb3e
parent6c4a5cde18a4569c44b9f731b576ff2a9c207018
parent94b6d1164001af38af15d73ef21af4f73975ca42
Merge changes Id437e220,I9d6b3fba
am: 94b6d11640

Change-Id: Ide9468359dc4bdfd9e47a3f5f3aaa345d8096cd8