tree cb5db8e920478006ea00ea2a70b7d31ea31c4153
parent 0f8e72a03dc50f6d6b81aa87803ea558fe4f7b6c
parent 144f2f68bbef4e0988f2bf1d4ed7e4b9b227b771
author The Android Open Source Project <initial-contribution@android.com> 1279040680 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279040680 -0700

am 144f2f68: merge from open-source master

Merge commit '144f2f68bbef4e0988f2bf1d4ed7e4b9b227b771'

* commit '144f2f68bbef4e0988f2bf1d4ed7e4b9b227b771':
  Fix broken build