tree 2ef5f477438456023d4e8ebb9ac95b5bb3b1b6b3
parent c9053699b9fb0f8536c19118b0d27becbd78af7d
parent 99a25fbaa50a077c5d62b9ae204677c176534d8b
author android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> 1261086650 -0800
committer android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> 1261086650 -0800

Merge branch 'eclair' into eclair-release