am 13485642: am bc5198b8: am 8822a52c: am 287c739d: Merge "Fix build"

* commit '1348564283733323977fd0f5049101637136432c':
This commit is contained in:
Satoshi Kataoka 2013-10-10 08:22:30 -07:00 committed by Android Git Automerger
commit 13946f911b

Diff content is not available