tree 8d80ab17813cb6178914530ea642a09293632882
parent f2e1440116da114bf2ec5738c07dfe97703101eb
parent dc1af23a44e57034a9622e6d9a22c5fe310dd3c7
author Dan Albert <danalbert@google.com> 1470687815 -0700
committer Dan Albert <danalbert@google.com> 1470687815 -0700

Sync with NDK master.