tree 236169ee071053a67036fa4d4cc8fbe69c4b9f91
parent 4f5388df7f939b3d5854e8c59e82fa0f387a2a22
parent 00cb6417dcaea2b1d02f47b3afb60c435712161b
author Joe Onorato <joeo@android.com> 1285286693 -0700
committer Joe Onorato <joeo@android.com> 1285286709 -0700

Merge commit '00cb6417' into master.  Doesn't turn on the debugging.

Change-Id: I1d4db9c5256ba45a44e50e8229b895e2e5330690