OSDN Git Service

am c1d449d0: (-s ours) Fix http://b/2305223 (DO NOT MERGE)
authorDaniel Sandler <dsandler@google.com>
Fri, 4 Dec 2009 20:23:41 +0000 (12:23 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Dec 2009 20:23:41 +0000 (12:23 -0800)
Merge commit 'c1d449d071703d3c2b8c4d9961e812b4632b5c90' into eclair-mr2

* commit 'c1d449d071703d3c2b8c4d9961e812b4632b5c90':
  Fix http://b/2305223 (DO NOT MERGE)


Trivial merge