tree 20a0c65ae3db8898fb6328aeacf1212a63a6ecac
parent 7c446467dc1071749a51e9f0d0cbfd47fff5f318
parent 1a15abad223231c3c07c48d0608d7223d85eb461
author Jean-Baptiste Queru <jbq@google.com> 1243032329 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243032329 -0700

am 02e57214: Merge open-source donut back into internal tree

Merge commit '02e572140aed422ffa73e8d1c69ee22dd5f2bf80'

* commit '02e572140aed422ffa73e8d1c69ee22dd5f2bf80':