OSDN Git Service

Merge change I42d5994d into eclair-mr2
authorAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 12 Nov 2009 01:00:40 +0000 (17:00 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 12 Nov 2009 01:00:40 +0000 (17:00 -0800)
commit46c1ee2072ee97ac3f59e265676f03e2229a4ad1
tree37294e4bf6311c913385decff01685946d9f6c16
parent87ddfee675a35a132cad188268a46f96ca9d479e
parent44625352c3a017db5cff07061a039b9936aa3e68
Merge change I42d5994d into eclair-mr2

* changes:
  Use the ENABLE(INSPECTOR) guard instead of ENABLE(JAVASCRIPT_DEBUGGER). Also guard the inspector header.