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

am 380cd96e: Fix the build

Merge commit '380cd96e5d7018cbf43295c9f2f2a33897affd63'

* commit '380cd96e5d7018cbf43295c9f2f2a33897affd63':
  Fix the build