| commit | 492abb45bbdfc0c5b9ffd00f16e53ab628305da9 | [log] [tgz] |
|---|---|---|
| author | David Neto <dneto@google.com> | Mon Aug 07 22:58:17 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 07 22:58:17 2017 +0000 |
| tree | 50389a22d1a3784cba1dcad63c2ccc13efbec10e | |
| parent | e56edaeae46e330811564f6d51085a21b2244d05 [diff] | |
| parent | b252c470366118af0db2b4395217bedffb4c2e01 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into update-shaderc am: b252c47036 Change-Id: I9378997d10803805e3242e3f260ba25f5dc49b0d