Merge "Fix uninitialized values in astc decompression"
authorMika Isojärvi <misojarvi@google.com>
Fri, 12 Jun 2015 22:38:53 +0000 (22:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 12 Jun 2015 22:38:54 +0000 (22:38 +0000)

Trivial merge