OSDN Git Service

am 1067c3cb: Merge change Ia5ef9acd into eclair
authorFred Quintana <fredq@google.com>
Tue, 8 Dec 2009 01:04:43 +0000 (17:04 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Dec 2009 01:04:43 +0000 (17:04 -0800)
commitc1dc8e4e24509a99dfc1abac668d3aa5e36a7d6c
treef650a57dd9eb6a9977cf703f545d6f9dde3ff0ea
parentf4e27821dd63aac2b387f71cac9ba81dc1fbce11
parent1067c3cbab73a4bc75a2ebd2e3c51077db96fa24
am 1067c3cb: Merge change Ia5ef9acd into eclair

Merge commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-plus-aosp

* commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24':
  remove an old STOPSHIP comment