ref: 09cbb6c1f7ebca28f46c4f183747edfb60b62623
parent: fffeaa395c9c0bd1cb220b2c20fc30ff2585c275
parent: 7d54e0f0935f9130de457ea74c7bad30bc0d4a78
author: Johann <johannkoenig@google.com>
date: Wed May 7 04:54:13 EDT 2014
Merge "Android NDK support for x86 and mips"