am f37fe0c3: am 68af6242: am b0adc840: am 29875dab: Merge "Fix build"

* commit 'f37fe0c30d6979ef3e27a78ca188ca3b1301be26':
main
Satoshi Kataoka 2013-10-03 11:51:43 -07:00 committed by Android Git Automerger
commit b0673eb895

Diff Content Not Available