OSDN Git Service

am 517ebaa6: am 18ff0e32: am 1067c3cb: Merge change Ia5ef9acd into eclair
authorFred Quintana <fredq@google.com>
Thu, 10 Dec 2009 14:59:55 +0000 (06:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 10 Dec 2009 14:59:55 +0000 (06:59 -0800)
commitf7ae3c958b4888969f8ee6b0a9a5226680397a94
tree11949b4c3d4e1ce0fdc8c21c5768488365ec739b
parenta493294753149be872090443b0509bd2e2116b57
parent517ebaa69a9c4baed99bb5667b956dab129c96e7
am 517ebaa6: am 18ff0e32: am 1067c3cb: Merge change Ia5ef9acd into eclair

Merge commit '517ebaa69a9c4baed99bb5667b956dab129c96e7'

* commit '517ebaa69a9c4baed99bb5667b956dab129c96e7':
  remove an old STOPSHIP comment