tree 42694602e5fd49592a69793a41268089ccaf71c9
parent a85449895acd2413c5d5b0f063007be787f157ae
parent 4117fd09e619c039a2bf5eff1bdc98186329cb4d
author Android (Google) Code Review <android-gerrit@google.com> 1247169218 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1247169218 -0700

am 4117fd09: Merge change 6641 into donut

Merge commit '4117fd09e619c039a2bf5eff1bdc98186329cb4d'

* commit '4117fd09e619c039a2bf5eff1bdc98186329cb4d':
  Unbreaking the build.