tree 05298858f77dca3bced5583a57b7e30c35b36342
parent 44fe74c901e761746f7308af19ebf53da5ea157c
parent c15de03df8e9d3a1256a57b6ae0a31e862519d9f
author Mike Lockwood <lockwood@android.com> 1259801853 -0500
committer Mike Lockwood <lockwood@android.com> 1259801853 -0500

resolved conflicts for merge of 9b7dba93 to eclair-mr2

Change-Id: I9a5412b8812aebc934540b1f6f9a9f9c96d89f59