tree 9dd813314142ba5254a3dc04437b2875fde14e37
parent 4895b6f540cc0c6d1111c48833999dd0624ccf2b
parent 8ffd5f8087a380e1daa9000a12908f83d376a6da
author Jean-Baptiste Queru <jbq@google.com> 1340735681 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340735681 -0700

am 8ffd5f80: Restore crespo4g

* commit '8ffd5f8087a380e1daa9000a12908f83d376a6da':
  Restore crespo4g