tree 48d568d4203bdf2d70fdffa306650cb133aa21f5
parent 12cd8a3c27aac27832d42f559afeebf0d95f14d3
parent 7eec2bcf6fd6c0072d8523c459f305c178f83ee7
author Romain Guy <romainguy@google.com> 1269892842 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1269892842 -0700

Merge "Tame the monkey. Bug #2547546" into froyo