tree 2038b9818dfee41669f2f15fe58096b0fbaa71f0
parent bd147430f139105e1f6e15a50e8d0b18876d9905
author Jean-Baptiste Queru <jbq@google.com> 1319465562 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1319645006 -0700

Backport from master - add crespo and stingray

Bug: 4295425
Change-Id: If76168a8ba488c3302a01be5855f815e9e6f6f97