tree e10e0e494af6b97a982f688cf4df5827845bb6be
parent c21e0e2d0c29f12d4f65cd18f0685068e76d7c73
parent bb39b9f17b0a9b6ecf2087b8454730ba6ac8b876
author Dianne Hackborn <hackbod@google.com> 1283888193 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283888193 -0700

am 11bbe200: Hopefully fix the build.

Merge commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5' into gingerbread-plus-aosp

* commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5':
  Hopefully fix the build.