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

* commit 'e6def5f58d8130556271e1b651520dcacb6acf75':
main
Ken Wakasa 2013-10-09 22:43:26 -07:00 committed by Android Git Automerger
commit 7d46a9a67b

Diff Content Not Available