tree b7a3cd2bd1a437237e71598d05b88be3f681c610
parent e7be66e5e5843e6e2fc5c6a381443d18104ac148
parent 840964f714166462444c17a424032864aa90e1e9
author Romain Guy <romainguy@android.com> 1243016752 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243016752 -0700

am c0292b04: Fix the build

Merge commit 'c0292b04407d93a11ee1412ed52cc5b04642a6f1'

* commit 'c0292b04407d93a11ee1412ed52cc5b04642a6f1':
  Fix the build