| commit | e4656ee4acfbf32bfe925c8c429a7b7375f63517 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Thu Oct 30 10:43:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 10:43:15 2014 +0000 |
| tree | 49eb103adee3ada4731e8926b84258b637522a9c | |
| parent | 0c10cc4c41188f47e14cdb71713665c2f3cad35a [diff] | |
| parent | 8122b531fdfd512f714e526d895d3f2c3c9d2f7f [diff] |
am 8122b531: am fbb88289: resolved conflicts for merge of 7472654e to stage-aosp-master * commit '8122b531fdfd512f714e526d895d3f2c3c9d2f7f': Fix GPU emulation crash.