OSDN Git Service

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

Merge commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-mr2

* commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24':
  remove an old STOPSHIP comment
core/java/android/content/Context.java