tree 4b49e234a927329adfe8e59de8446a26303119a9
parent 54e2e86c5740a2c7a02e95e94c4aff362a5502cf
author Doug Zongker <dougz@android.com> 1250622345 -0700
committer Doug Zongker <dougz@android.com> 1250622345 -0700

do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from master