tree 02aef7d453844a5b7b823e68f29b6f4d53ec2062
parent da73c40ff0d3d9ece732b96553fb87d21e9ce06b
parent c56b26b8b0425fd8f27b381d716408b64f43699e
author Android (Google) Code Review <android-gerrit@google.com> 1247598110 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1247598110 -0700

am c56b26b8: Merge change 6997 into donut

Merge commit 'c56b26b8b0425fd8f27b381d716408b64f43699e'

* commit 'c56b26b8b0425fd8f27b381d716408b64f43699e':
  Rename IActivityWatcher to IActivityController