am b0adc840: am 29875dab: Merge "Fix build"

* commit 'b0adc84004f570cf496dd1cf74b6f834ea5a4683':
main
Satoshi Kataoka 2013-09-26 05:54:25 -07:00 committed by Android Git Automerger
commit 68af6242cb

Diff Content Not Available