tree 52fb27a31519f7bb74bfebf3f4ef3e78364c3657
parent 19b9abb65c716c6dc9d1164223ba0cca21d0da8a
parent f74588cb88a9d9906ecf70ed6460f8bddc4810a0
author Android (Google) Code Review <android-gerrit@google.com> 1245082076 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1245082076 -0700

am f74588cb: Merge change 4060 into donut

Merge commit 'f74588cb88a9d9906ecf70ed6460f8bddc4810a0'

* commit 'f74588cb88a9d9906ecf70ed6460f8bddc4810a0':
  Trivial: renamed the parameters to be inline with the standard.