tree 85fbf84faee0d164617d2eab10e2f9c805271cf0
parent 31f0fc22357707b7c71f2ca08878b6ce6ddde1cb
parent 4011770f2d06fcb743abc91a01a531c7ae2d9175
author Jean-Baptiste Queru <jbq@google.com> 1255561902 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255561902 -0700

am 4011770f: merge from open-source master

Merge commit '4011770f2d06fcb743abc91a01a531c7ae2d9175'

* commit '4011770f2d06fcb743abc91a01a531c7ae2d9175':