am d9b1079a: am c2acf0a8: am dc325724: am 17cc3969: Merge "Fix build"

* commit 'd9b1079a627b2c8d5249c8aa75f31dcf1e16cccf':
main
Satoshi Kataoka 2013-10-03 12:07:22 -07:00 committed by Android Git Automerger
commit 68e9c45b5c

Diff Content Not Available