tree ac7f92c59b02440edaf0b33260477a40abd66cf8
parent cfbcd758d8200d218e777be69cf8fc67a05e6a00
parent 68f21cdc71b9ad7362e4f7c22d44a601c9e58f07
author Jean-Baptiste Queru <jbq@google.com> 1287795827 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287795827 -0700

am 68f21cdc: (-s ours) Minor cleanup - DO NOT MERGE

Merge commit '68f21cdc71b9ad7362e4f7c22d44a601c9e58f07'

* commit '68f21cdc71b9ad7362e4f7c22d44a601c9e58f07':
  Minor cleanup - DO NOT MERGE