tree a842609e9c64cb2f3310f70483016c2327b4e801
parent eef408c45b178c2f0128c307729135775ebeda86
parent f232d4e1f532d120e8176c5a50c0a294022eec75
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.