am 97b06ef7: Merge (ignore) from open-source master tree

Merge commit '97b06ef7ddf66dae500e94b55d943cad61d28ae7'

* commit '97b06ef7ddf66dae500e94b55d943cad61d28ae7':
This commit is contained in:
Jean-Baptiste Queru
2010-08-31 13:13:06 -07:00
committed by Android Git Automerger

Diff Content Not Available