OSDN Git Service

am 46c1ee20: Merge change I42d5994d into eclair-mr2
authorBen Murdoch <benm@google.com>
Thu, 12 Nov 2009 01:10:29 +0000 (17:10 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Nov 2009 01:10:29 +0000 (17:10 -0800)
commit30f258c7a75355f02fb9354b0f3138979e9a5104
tree91ee45898645190296ab8fd77a682e0b6926b95e
parent723d306ebb6af81f9e5b06e3ec93888cbe7c3580
parent46c1ee2072ee97ac3f59e265676f03e2229a4ad1
am 46c1ee20: Merge change I42d5994d into eclair-mr2

Merge commit '46c1ee2072ee97ac3f59e265676f03e2229a4ad1'

* commit '46c1ee2072ee97ac3f59e265676f03e2229a4ad1':
  Use the ENABLE(INSPECTOR) guard instead of ENABLE(JAVASCRIPT_DEBUGGER). Also guard the inspector header.