| commit | 6785c2534ab29a5a4c7e6ac83f53e4e008758ceb | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@android.com> | Tue Aug 18 12:13:35 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 12:13:35 2009 -0700 |
| tree | 4b49e234a927329adfe8e59de8446a26303119a9 | |
| parent | c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 [diff] | |
| parent | 34c98df78a80881698f63ce0815f3e16823d85e0 [diff] |
am 34c98df7: (-s ours) do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from master Merge commit '34c98df78a80881698f63ce0815f3e16823d85e0' * commit '34c98df78a80881698f63ce0815f3e16823d85e0': do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from master