tree 5136898a50bbb66797975b4bd0396f248d4c7a03
parent 6d0300e54741991089ba060fbddddcccf43feaf9
parent cc642ea9f9b79658ed980dfb86b3a211484e7d14
author Android Build Merger (Role) <android-build-merger@google.com> 1466017680 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1466017681 +0000

Merge "Update SPIR-V prebuilts am: 14f4878563 am: 4b8d1b82ef" into nyc-mr1-dev-plus-aosp