tree 379120f00cb9d85b1d61238cba2b3fd0e47464a1
parent cc43adab338983c5b5bc8ca0658bbc2d56603f09
parent cf3592c5bf1c66ba510934fff5eb57ee0b3fd761
author Jean-Baptiste Queru <jbq@google.com> 1295069416 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295069416 -0800

am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not merge

* commit '9286cfe5017363d95798d85163ec4f28aeb0c675':
  Squash commits of the following patches, cherry-picked from other branch - do not merge.