tree 954d6a974cf54c149ec8b0c87bf0b87bdbe3e8ca
parent c892e6f4d24dc4eed7115acf81fd08d3aaac2665
parent 1edd7334f3ab71386426055e93c6bb003041f802
author Jean-Baptiste Queru <jbq@google.com> 1255561895 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255561895 -0700

am 1edd7334: merge from open-source master

Merge commit '1edd7334f3ab71386426055e93c6bb003041f802'

* commit '1edd7334f3ab71386426055e93c6bb003041f802':