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

* commit 'dc3257246adeeaababa547910d09e585cfef7480':
main
Satoshi Kataoka 2013-09-26 06:01:11 -07:00 committed by Android Git Automerger
commit c2acf0a8d8

Diff Content Not Available