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

* commit '9ca0e511e8a604dabb2ce0055ed38501af66eb6d':
This commit is contained in:
Ken Wakasa 2013-10-03 15:51:14 -07:00 committed by Android Git Automerger
commit 2ac06cc87d

Diff content is not available