tree 50389a22d1a3784cba1dcad63c2ccc13efbec10e
parent e56edaeae46e330811564f6d51085a21b2244d05
parent b252c470366118af0db2b4395217bedffb4c2e01
author David Neto <dneto@google.com> 1502146697 +0000
committer android-build-merger <android-build-merger@google.com> 1502146697 +0000

Merge remote-tracking branch 'aosp/upstream-master' into update-shaderc
am: b252c47036

Change-Id: I9378997d10803805e3242e3f260ba25f5dc49b0d