tree 4eb9a83f36e570f4b42b03840988ecf9b96d549a
parent ff11012d99f01ba9c0b9c66f7ae089df8d93f813
parent 720d1e962e248a30f81c1493081ff4c01e35c839
author android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> 1274988613 -0700
committer android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> 1274988613 -0700

Merge commit '720d1e962e248a30f81c1493081ff4c01e35c839' into froyo-plus-aosp