tree b9128f38242b2d7b1b7f665b8aafd458bb5c7f6a
parent 24feaf6b650fffc1557c79b0681af372cc180671
parent 001eb417d9cc6abc7478fc3e0528b74f8289a758
author Jean-Baptiste Queru <jbq@google.com> 1265919619 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265919619 -0800

am 001eb417: Merge from open-source master

Merge commit '001eb417d9cc6abc7478fc3e0528b74f8289a758'

* commit '001eb417d9cc6abc7478fc3e0528b74f8289a758':