tree 6ed38ece8043e4c41ece2462b2f66c08411fd3aa
parent 591d8daf0adca543ee408e69bf3495abd204bfe5
parent 1d3c00a50b193ce606dc347e7ad61d58e6fad5a7
author Brian Carlstrom <bdc@google.com> 1347490703 -0700
committer android code review <noreply-gerritcodereview@google.com> 1347490703 -0700

Merge "Disable x86 assembly on darwin"