am 8d5a09f7: resolved conflicts for merge of 466ee0e8 to master
authorKalle Raita <kraita@google.com>
Mon, 22 Jun 2015 18:20:41 +0000 (18:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 22 Jun 2015 18:20:41 +0000 (18:20 +0000)
commit7377e9320e84cb021094a6068ab6c5e1761d8e8d
treed82340e27e1a4503abd9e4df089fd5774a85092a
parent66233644e1b83e623d7150a79f06d4d473289611
parent8d5a09f7d0a02e1403f5df7a888e2a57609ee929
am 8d5a09f7: resolved conflicts for merge of 466ee0e8 to master

* commit '8d5a09f7d0a02e1403f5df7a888e2a57609ee929':
  Fix unrelated errors in ASTC negative API tests