tree 8f7aee8dc461322d76a0071c60e8c9ad4227ee64
parent 2f39bf9a9f83b3fd165fa3b443a16b2fe86cd124
parent 9a77b613f3fdf6340b0f5f24d1c725fd0001e4a9
author Jean-Baptiste Queru <jbq@google.com> 1252087532 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1252087532 -0700

am 9a77b613: merge from open-source master

Merge commit '9a77b613f3fdf6340b0f5f24d1c725fd0001e4a9'

* commit '9a77b613f3fdf6340b0f5f24d1c725fd0001e4a9':