tree 81ac3bd091ec6ba3fd96da533d4034641cf4dc46
parent f99599b2e856cc806b2ccf66b996498a5b2ca9bf
parent 800c215fa89f913626510adc01bdb6b8f4dec041
author Romain Guy <romainguy@android.com> 1245890447 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1245890447 -0700

am 800c215f: Fix the build

Merge commit '800c215fa89f913626510adc01bdb6b8f4dec041'

* commit '800c215fa89f913626510adc01bdb6b8f4dec041':
  Fix the build