tree 05464b26381e2356fe725082cf73243d70b72618
parent 665839d51f65efaf1cad0bbad099a234f33216f7
author Scott Baker <smbaker@gmail.com> 1467224853 -0700
committer Scott Baker <smbaker@gmail.com> 1467224853 -0700

bring over changes from xos repo I294b03f4729417881e22038e984016223a795746

Change-Id: Ief18e6f2602a2a63618ae1d703143861ee05ec69