OSDN Git Service

am e33044ea: (-s ours) Merge change Ib9cc041e into eclair-sdk
authorYing Wang <wangying@google.com>
Thu, 5 Nov 2009 00:18:04 +0000 (16:18 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Nov 2009 00:18:04 +0000 (16:18 -0800)
commitb5e380a799b1c22d51364a2b9b3abe02e2eb83cf
tree9438c859f25a48afa639633312de48273ed36248
parent595596fe6b6fd52bf26d224f18b8724a4d151316
parente33044eadfa9969e71e50d1aff165cbc436b13f3
am e33044ea: (-s ours) Merge change Ib9cc041e into eclair-sdk

Merge commit 'e33044eadfa9969e71e50d1aff165cbc436b13f3' into eclair

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