tree 42fdf22f18dc4097c2f86cbd691fe6b1c8bd3820
parent 0cf0e33b5fdb6eb871b64f5325ccd54339f62f01
author Doug Zongker <dougz@android.com> 1250540464 -0700
committer Doug Zongker <dougz@android.com> 1250540464 -0700

do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branch