am 2ac06cc8: am 9ca0e511: am 086ffdcc: am 6c0e48b1: am 4350a93a: Merge "Fix the offdevice regression test build"

* commit '2ac06cc87de104baece3e1150cea3a13054e0973':
main
Ken Wakasa 2013-10-03 16:29:24 -07:00 committed by Android Git Automerger
commit fd86a8184b

Diff Content Not Available