tree ac72f58d6dba372a0c81dc17eaa8fde0dfdf5119
parent e650560b8bd25f0284dbecb3a834acc2c405c9fa
parent bac5ab03db021eac2dd5b0043251c60be9d2723e
author Android (Google) Code Review <android-gerrit@google.com> 1258381595 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1258381595 -0800

Merge change Ibac5ab03 into eclair-mr2

* changes:
  Add a guard on InspectorTimelineAgent, and remove unnecessary guards...