tree c9c6b85fb2a561fbce26ab175501ccb06e520713
parent 9a049a25da50ff4b8186dd62f5c842914f41b08f
parent e9f7d8ac3cda59f2637776eea1dfad0e171fba21
author David Neto <dneto@google.com> 1502146688 +0000
committer android-build-merger <android-build-merger@google.com> 1502146688 +0000

Merge remote-tracking branch 'aosp/upstream-master' into refresh-shaderc
am: e9f7d8ac3c

Change-Id: Ia5fe62af137a4b9e76b7cb9e0ad117763f8c13fc