OSDN Git Service

am 35ea90de: am b5e380a7: (-s ours) am e33044ea: (-s ours) Merge change Ib9cc041e...
authorYing Wang <wangying@google.com>
Thu, 5 Nov 2009 00:42:17 +0000 (16:42 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Nov 2009 00:42:17 +0000 (16:42 -0800)
commitc526e5d57b4f700370c7204e112e4e231aa3c482
treedaa5cdce57cfe564179b3045bf9c68c9b55bcc6c
parent9d45108a5f341f426d2e5472e6c9319b8e482748
parent35ea90deee5050a66909b2740601bd81f9f29780
am 35ea90de: am b5e380a7: (-s ours) am e33044ea: (-s ours) Merge change Ib9cc041e into eclair-sdk

Merge commit '35ea90deee5050a66909b2740601bd81f9f29780' into eclair-mr2-plus-aosp

* commit '35ea90deee5050a66909b2740601bd81f9f29780':
  Explicitly specify that online-sdk depends on framework-res. (do not merge)