| commit | 340d3b96a409aa6e941d3b013dbfbb7e9b548994 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 13 10:04:40 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 13 10:04:40 2010 -0700 |
| tree | cb5db8e920478006ea00ea2a70b7d31ea31c4153 | |
| parent | 0f8e72a03dc50f6d6b81aa87803ea558fe4f7b6c [diff] | |
| parent | 144f2f68bbef4e0988f2bf1d4ed7e4b9b227b771 [diff] |
am 144f2f68: merge from open-source master Merge commit '144f2f68bbef4e0988f2bf1d4ed7e4b9b227b771' * commit '144f2f68bbef4e0988f2bf1d4ed7e4b9b227b771': Fix broken build