am 604f52e3: Reconcile with AOSP master

* commit '604f52e31357a774ad49290e323976b1db5b9f38':
  Fix build
This commit is contained in:
Jean-Baptiste Queru 2011-10-28 15:39:50 +00:00 committed by Android Git Automerger
commit 71619f1395

Diff content is not available